diff options
| author | guidog <guidog@517b70f8-ed25-0410-8bf6-f5db08f7b76e> | 2009-01-12 18:13:29 +0000 |
|---|---|---|
| committer | guidog <guidog@517b70f8-ed25-0410-8bf6-f5db08f7b76e> | 2009-01-12 18:13:29 +0000 |
| commit | 807916523f75ae12a653f00f5eff3cc134568d54 (patch) | |
| tree | 4437382f282406825f3eff08168e502fc3f4b045 | |
| parent | bfc744775f26cfcff5c732b0e99a4903363eb0ce (diff) | |
move icons to $(datadir)/krb5-auth-dialog
and add this to the icon search path. Fixes installations with prefix !=
/usr
git-svn-id: http://svn.gnome.org/svn/krb5-auth-dialog/trunk@121 517b70f8-ed25-0410-8bf6-f5db08f7b76e
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | icons/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/krb5-auth-applet.c | 3 | ||||
| -rw-r--r-- | src/krb5-auth-dialog.c | 3 |
5 files changed, 21 insertions, 6 deletions
@@ -1,3 +1,14 @@ +Mon Jan 12 00:36:45 CET 2009 Guido Günther <agx@sigxcpu.org> + + move icons to $(datadir)/krb5-auth-dialog to fix missing tray icon + when prefix != /usr + * icons/Makefile.am (smallicondir): move to $(pkgdatadir) + * src/Makefile.am: rename glade_DATA to pkgdata_DATA, GLADEDIR to + KA_DATA_DIR + * src/krb5-auth-applet.c (ka_create_tray_icon): extend icon search + path by $(KA_DATA_DIR)/icons + * src/krb5-auth-dialog.c (main): use $(KA_DATA_DIR) + Sun Jan 11 22:59:34 CET 2009 Guido Günther <agx@sigxcpu.org> * AUTHORS, MAINTAINERS: add myself diff --git a/icons/Makefile.am b/icons/Makefile.am index d13dbbf..e2e3987 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -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 \ diff --git a/src/Makefile.am b/src/Makefile.am index 18ab709..568f3bc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = \ - -DGLADEDIR=\""$(gladedir)/"\" \ + -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ -DLOCALE_DIR=\""$(localedir)/"\" bin_PROGRAMS = krb5-auth-dialog @@ -43,12 +43,12 @@ krb5_auth_dialog_LDADD = \ 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 diff --git a/src/krb5-auth-applet.c b/src/krb5-auth-applet.c index c915240..99b4007 100644 --- a/src/krb5-auth-applet.c +++ b/src/krb5-auth-applet.c @@ -254,6 +254,9 @@ ka_create_tray_icon (Krb5AuthApplet* applet) 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"; diff --git a/src/krb5-auth-dialog.c b/src/krb5-auth-dialog.c index 3beaa8b..cc4a77c 100644 --- a/src/krb5-auth-dialog.c +++ b/src/krb5-auth-dialog.c @@ -886,7 +886,8 @@ main (int argc, char *argv[]) /* 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"); |