From edba4f977f7ba9692e48cf40dea2466b07e967e1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 10 Sep 2009 15:59:38 -0500
Subject: Grabbing the icons from the indicator dir where we install them.

---
 src/gtk-dialog/Makefile.am         | 2 +-
 src/gtk-dialog/gtk-logout-helper.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gtk-dialog/Makefile.am b/src/gtk-dialog/Makefile.am
index 90a6209..5f2df2f 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 = $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror
+gtk_logout_helper_CFLAGS = $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\""
 gtk_logout_helper_LDADD =  $(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);
-- 
cgit v1.2.3


From 0cb4e60ef1a5034dec49ea28f0545055c0460597 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 10 Sep 2009 16:03:59 -0500
Subject: Setting the window icon now that we have the right path

---
 src/gtk-dialog/logout-dialog.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
-- 
cgit v1.2.3