ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-session/icons into lp:indicator-session.

Requested reviews:
    Indicator Applet Developers (indicator-applet-developers)

Fixes a couple of icons issues.
-- 
https://code.launchpad.net/~ted/indicator-session/icons/+merge/11560
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'src/gtk-dialog/Makefile.am'
--- src/gtk-dialog/Makefile.am	2009-09-02 14:17:44 +0000
+++ src/gtk-dialog/Makefile.am	2009-09-10 20:59:38 +0000
@@ -10,6 +10,6 @@
 	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)
 

=== modified file 'src/gtk-dialog/gtk-logout-helper.c'
--- src/gtk-dialog/gtk-logout-helper.c	2009-09-02 14:17:44 +0000
+++ src/gtk-dialog/gtk-logout-helper.c	2009-09-10 20:59:38 +0000
@@ -133,6 +133,10 @@
 		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);

=== modified file 'src/gtk-dialog/logout-dialog.c'
--- src/gtk-dialog/logout-dialog.c	2009-08-11 13:25:43 +0000
+++ src/gtk-dialog/logout-dialog.c	2009-09-10 21:03:59 +0000
@@ -298,8 +298,9 @@
 						  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);