Created attachment 80025 [details] [review]
patch

Patch doesn't apply to trunk any more...

Created attachment 81624 [details] [review]
rediff'd against svn trunk

Ok, looks good, go ahead. Mind fixing those other dirs defined in configure as well while you're at it? ;-)

        * capplets/accessibility/at-properties/Makefile.am:
        * capplets/accessibility/keyboard/Makefile.am:
        * capplets/background/Makefile.am:
        * capplets/common/Makefile.am:
        * capplets/default-applications/Makefile.am:
        * capplets/display/Makefile.am:
        * capplets/font/Makefile.am:
        * capplets/keybindings/Makefile.am:
        * capplets/keyboard/Makefile.am:
        * capplets/mouse/Makefile.am:
        * capplets/network/Makefile.am:
        * capplets/theme-switcher/Makefile.am:
        * capplets/ui-properties/Makefile.am:
        * capplets/windows/Makefile.am:
        * configure.in:
        * gnome-settings-daemon/Makefile.am:
        * libbackground/Makefile.am:
        * libwindow-settings/Makefile.am:
        * typing-break/Makefile.am:
        * vfs-methods/fontilus/Makefile.am:
        * vfs-methods/themus/Makefile.am: Fix localedir defines. Bug #395383.

Created attachment 81628 [details] [review]
define dbus service dir in Makefile

Cool. There's still more where that came from. ;-)

        * configure.in:
        * gnome-settings-daemon/Makefile.am: Don't define dbus services

Created attachment 81637 [details] [review]
last patch

Awesome. Thanks a lot. A few nitpicks, though:

gnome-settings-daemon/MAkefile.am now defines both
+	-DPIXMAPSDIR="\"$(pkgdatadir)/pixmaps\""	\
and
+	-DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\""
One of these shouldn't be needed (or the first definition is simply
wrong because is should be $(datadir)/pixmaps).

You replaced
-GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
by
+	-DGNOMECC_ICONS_DIR="\"$(pkgdatadir)/icons\""	\
Since there's almost nothing in this directory anyway, I think we should just use
GNOMECC_PIXMAPS_DIR instead and get rid of ICONS_DIR completely.

The rest looks mighty fine to me.

Created attachment 81763 [details] [review]
updated last patch

(In reply to comment #10)
> Awesome. Thanks a lot. A few nitpicks, though:
> 
> gnome-settings-daemon/MAkefile.am now defines both
> +       -DPIXMAPSDIR="\"$(pkgdatadir)/pixmaps\""        \
> and
> +       -DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\""
> One of these shouldn't be needed (or the first definition is simply
> wrong because is should be $(datadir)/pixmaps).

I fixed it to only use GNOMECC_PIXMAPS_DIR.

> 
> You replaced
> -GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
> by
> +       -DGNOMECC_ICONS_DIR="\"$(pkgdatadir)/icons\""   \
> Since there's almost nothing in this directory anyway, I think we should just
> use
> GNOMECC_PIXMAPS_DIR instead and get rid of ICONS_DIR completely.

I didn't address that in this patch. The whole CC could use an audit of its icons use (I see many 'pixmaps' used where there really should be themed icons since they're used in different sizes [e.g. window list and window border icon, etc]). That should be done in another bug, IMHO.

There's lots of stuff that would benefit from an audit...
But I guess small steps is better than no steps at all.

(In reply to comment #12)
> There's lots of stuff that would benefit from an audit...
> But I guess small steps is better than no steps at all.

Are there bug(s) filed for this, or should I look into filing one (or one per capplet?) ?


Committed.

        * Makefile.am:
        * capplets/about-me/Makefile.am:
        * capplets/about-me/gnome-about-me-password.c: (passdlg_init):
        * capplets/about-me/gnome-about-me.c: (about_me_setup_dialog):
        * capplets/accessibility/at-properties/Makefile.am:
        * capplets/accessibility/keyboard/Makefile.am:
        * capplets/accessibility/keyboard/accessibility-keyboard.c:
        (setup_accessX_dialog):
        * capplets/background/Makefile.am:
        * capplets/background/gnome-wp-capplet.c: (gnome_wp_create_dialog):
        * capplets/common/Makefile.am:
        * capplets/common/capplet-util.c: (capplet_set_icon):
        * capplets/default-applications/Makefile.am:
        * capplets/display/Makefile.am:
        * capplets/file-types/Makefile.am:
        * capplets/file-types/file-types-capplet.c: (create_dialog):
        * capplets/file-types/mime-category-edit-dialog.c:
        (mime_category_edit_dialog_init):
        * capplets/file-types/mime-edit-dialog.c: (mime_edit_dialog_init):
        * capplets/file-types/service-edit-dialog.c:
        (service_edit_dialog_init):
        * capplets/font/Makefile.am:
        * capplets/keybindings/Makefile.am:
        * capplets/keybindings/gnome-keybinding-properties.c:
        (create_dialog):
        * capplets/keyboard/Makefile.am:
        * capplets/keyboard/gnome-keyboard-properties-xkblt.c:
        (xkb_layout_choose):
        * capplets/keyboard/gnome-keyboard-properties-xkbmc.c:
        (choose_model):
        * capplets/keyboard/gnome-keyboard-properties.c: (create_dialog):
        * capplets/localization/Makefile.am:
        * capplets/localization/gnome-localization-properties.c:
        (create_dialog):
        * capplets/mime-type/Makefile.am:
        * capplets/mouse/Makefile.am:
        * capplets/mouse/gnome-mouse-properties.c: (create_dialog):
        * capplets/network/Makefile.am:
        * capplets/network/gnome-network-preferences.c:
        (cb_http_details_button_clicked), (main):
        * capplets/rollback/Makefile.am:
        * capplets/sound/Makefile.am:
        * capplets/sound/sound-properties-capplet.c: (create_dialog),
        (device_test_button_clicked):
        * capplets/theme-switcher/Makefile.am:
        * capplets/ui-properties/Makefile.am:
        * capplets/ui-properties/gnome-ui-properties.c: (create_dialog):
        * capplets/url-properties/Makefile.am:
        * capplets/windows/Makefile.am:
        * capplets/wm-properties/wm-desktops/Makefile.am:
        * configure.in:
        * gnome-settings-daemon/Makefile.am:
        * gnome-settings-daemon/actions/Makefile.am:
        * gnome-settings-daemon/gnome-settings-xmodmap.c:
        (gnome_settings_modmap_dialog_call):
        * gnome-settings-daemon/gnome-settings-xrdb.c:
        * gnome-settings-daemon/gsd-media-keys-window.c: (action_changed),
        (gsd_media_keys_window_init):
        * gnome-settings-daemon/xrdb/Makefile.am:
        * typing-break/Makefile.am:
        * vfs-methods/themus/Makefile.am: Don't define directories in
        configure. Remove some obsolete defines, and use the standard
        installation paths. Bug #395383.

No, no bugs for icons at the moment.