applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use icon theme for app icons, bug #450777

Browse source 
svn path=/trunk/; revision=7784
This commit is contained in:
Michael Terry 2007-06-26 23:29:58 +00:00
parent 68295d5106
commit 6b9550b491
18 changed files with 88 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/localization/ChangeLog
View file

@ -1,3 +1,9 @@
2007-06-26 Michael Terry <mike@mterry.name>
* localization.desktop.in.in, Makefile.am,
gnome-localization-properties.c: Use icon theme instead of global
pixmaps dir for app icon. Closes bug #450777.
2006-12-08 Kjartan Maraas <kmaraas@gnome.org>
* gnome-localization-properties.c: (languages_changed_cb),

18
capplets/localization/Makefile.am
View file

@ -12,9 +12,8 @@ gnome_localization_properties_LDADD = \
gladedir = $(pkgdatadir)/glade
glade_DATA = gnome-localization-properties.glade
pixmapsdir = $(pkgdatadir)/pixmaps
pixmaps_DATA = \
localization-capplet.png
icondir = $(datadir)/icons/hicolor/48x48/apps
dist_icon_DATA = localization-capplet.png
desktopdir = $(datadir)/applications
desktop_in_files = localization.desktop.in
@ -23,3 +22,16 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(glade_DATA) $(pixmaps_DATA) $(desktop_in_files)
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
install-data-hook: update-icon-cache
uninstall-hook: update-icon-cache
update-icon-cache:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(gtk_update_icon_cache); \
else \
echo "*** Icon cache not updated. After (un)install, run this:"; \
echo "*** $(gtk_update_icon_cache)"; \
fi

2
capplets/localization/gnome-localization-properties.c
View file

@ -1101,7 +1101,7 @@ main (int argc, char **argv)
changeset = NULL;
dialog = create_dialog ();
setup_dialog (dialog, changeset);
capplet_set_icon (WID ("localization_dialog"), "localization-capplet.png");
capplet_set_icon (WID ("localization_dialog"), "localization-capplet");
gtk_widget_show (WID ("localization_dialog"));
gtk_main ();

2
capplets/localization/localization.desktop.in.in
View file

@ -3,7 +3,7 @@ Encoding=UTF-8
_Name=Language and Culture
_Comment=Set your language and culture preferences
Exec=gnome-localization-properties
Icon=localization-capplet.png
Icon=localization-capplet
Terminal=false
Type=Application
StartupNotify=true