krb5-auth-dialog r121 - in trunk: . icons src

[guidog svn gnome org]

Author: guidog
Date: Mon Jan 12 18:13:29 2009
New Revision: 121
URL: http://svn.gnome.org/viewvc/krb5-auth-dialog?rev=121&view=rev

Log:
move icons to $(datadir)/krb5-auth-dialog

and add this to the icon search path. Fixes installations with prefix !=
/usr

Modified:
   trunk/ChangeLog
   trunk/icons/Makefile.am
   trunk/src/Makefile.am
   trunk/src/krb5-auth-applet.c
   trunk/src/krb5-auth-dialog.c

Modified: trunk/icons/Makefile.am
==============================================================================
--- trunk/icons/Makefile.am	(original)
+++ trunk/icons/Makefile.am	Mon Jan 12 18:13:29 2009
@@ -1,6 +1,6 @@
 NULL =
 
-smallicondir=${datadir}/icons/hicolor/22x22/apps
+smallicondir=${pkgdatadir}/icons/hicolor/22x22/apps
 smallicon_DATA=		\
 	krb-valid-ticket.png	\
 	krb-no-valid-ticket.png	\

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Jan 12 18:13:29 2009
@@ -1,5 +1,5 @@
 INCLUDES = \
-	-DGLADEDIR=\""$(gladedir)/"\" \
+	-DKA_DATA_DIR=\""$(pkgdatadir)"\" \
 	-DLOCALE_DIR=\""$(localedir)/"\"
 
 bin_PROGRAMS = krb5-auth-dialog
@@ -43,12 +43,12 @@
 
 AM_CPPFLAGS = -I $(top_srcdir)/gtksecentry/ -I $(top_srcdir)/secmem/
 
-gladedir = $(datadir)/krb5-auth-dialog
-glade_DATA =			\
+pkgdatadir = $(datadir)/krb5-auth-dialog
+pkgdata_DATA =			\
 	krb5-auth-dialog.glade
 
 EXTRA_DIST =		\
-	$(glade_DATA)   \
+	$(pkgdata_DATA)   \
 	$(schema_in_files) \
 	$(autostart_in_files) \
 	krb5-auth-dialog.1.in

Modified: trunk/src/krb5-auth-applet.c
==============================================================================
--- trunk/src/krb5-auth-applet.c	(original)
+++ trunk/src/krb5-auth-applet.c	Mon Jan 12 18:13:29 2009
@@ -254,6 +254,9 @@
 int
 ka_setup_icons (Krb5AuthApplet* applet)
 {
+	/* Add application specific icons to search path */
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+					   KA_DATA_DIR G_DIR_SEPARATOR_S "icons");
 	applet->icons[val_icon] = "krb-valid-ticket";
 	applet->icons[exp_icon] = "krb-expiring-ticket";
 	applet->icons[inv_icon] = "krb-no-valid-ticket";

Modified: trunk/src/krb5-auth-dialog.c
==============================================================================
--- trunk/src/krb5-auth-dialog.c	(original)
+++ trunk/src/krb5-auth-dialog.c	Mon Jan 12 18:13:29 2009
@@ -886,7 +886,8 @@
 
 		/* setup the pw dialog */
 		glade_set_custom_handler (&ka_create_gtk_secure_entry, NULL);
-		applet->pw_xml = glade_xml_new (GLADEDIR "krb5-auth-dialog.glade", NULL, NULL);
+		applet->pw_xml = glade_xml_new (KA_DATA_DIR G_DIR_SEPARATOR_S
+						"krb5-auth-dialog.glade", NULL, NULL);
 		applet->pw_wrong_label = glade_xml_get_widget (applet->pw_xml, "krb5_wrong_label");
 		applet->pw_dialog = glade_xml_get_widget (applet->pw_xml, "krb5_dialog");