diff options
| author | Ted Gould <ted@canonical.com> | 2009-09-10 17:02:32 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-09-10 17:02:32 -0500 |
| commit | 6dc72285140a2dd9a9c9aeaa6df67a747a3573dc (patch) | |
| tree | a94c7f4cf11b09604b36720fb250cefa61579755 | |
| parent | 87cd8b1916a513d0b283e490f0b9475c71048a0f (diff) | |
| parent | 0cb4e60ef1a5034dec49ea28f0545055c0460597 (diff) | |
| download | ayatana-indicator-session-6dc72285140a2dd9a9c9aeaa6df67a747a3573dc.tar.gz ayatana-indicator-session-6dc72285140a2dd9a9c9aeaa6df67a747a3573dc.tar.bz2 ayatana-indicator-session-6dc72285140a2dd9a9c9aeaa6df67a747a3573dc.zip | |
Merging in the branch with icon fixes in it.
| -rw-r--r-- | src/gtk-dialog/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gtk-dialog/gtk-logout-helper.c | 4 | ||||
| -rw-r--r-- | src/gtk-dialog/logout-dialog.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/gtk-dialog/Makefile.am b/src/gtk-dialog/Makefile.am index 9cdc18e..3f14d78 100644 --- a/src/gtk-dialog/Makefile.am +++ b/src/gtk-dialog/Makefile.am @@ -10,6 +10,6 @@ gtk_logout_helper_SOURCES = \ logout-dialog.c \ logout-dialog.h -gtk_logout_helper_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror +gtk_logout_helper_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" gtk_logout_helper_LDADD = $(SESSIONSERVICE_LIBS) $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS) diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index 13991ca..e6a9ef8 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -133,6 +133,10 @@ main (int argc, char * argv[]) return 1; } + /* Init some theme/icon stuff */ + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), + INDICATOR_ICONS_DIR); + GtkWidget * dialog = NULL; if (!pk_require_auth(type) && !supress_confirmations()) { dialog = logout_dialog_new(type); diff --git a/src/gtk-dialog/logout-dialog.c b/src/gtk-dialog/logout-dialog.c index a80dbef..a94c649 100644 --- a/src/gtk-dialog/logout-dialog.c +++ b/src/gtk-dialog/logout-dialog.c @@ -298,8 +298,9 @@ logout_dialog_init (LogoutDialog *logout_dialog) GTK_RESPONSE_OK); gtk_widget_grab_default (logout_dialog->ok_button); - /* Title */ + /* Window Title and Icon */ gtk_window_set_title (GTK_WINDOW(logout_dialog), _(title_strings[logout_dialog->action])); + gtk_window_set_icon_name (GTK_WINDOW(logout_dialog), icon_strings[logout_dialog->action]); /* hbox */ logout_dialog->hbox = gtk_hbox_new (FALSE, 12); |