evolution r36582 - in branches/gnome-2-24: addressbook addressbook/gui/widgets calendar calendar/gui

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Oct  9 13:03:41 2008
New Revision: 36582
URL: http://svn.gnome.org/viewvc/evolution?rev=36582&view=rev

Log:
2008-10-09  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #555494

	* addressbook/gui/widgets/e-addressbook-view.c
	(generate_viewoption_menu):
	* calendar/gui/cal-search-bar.c (generate_viewoption_menu):
	Category icons are not themed.  Load by file, not by icon name.



Modified:
   branches/gnome-2-24/addressbook/ChangeLog
   branches/gnome-2-24/addressbook/gui/widgets/e-addressbook-view.c
   branches/gnome-2-24/calendar/ChangeLog
   branches/gnome-2-24/calendar/gui/cal-search-bar.c

Modified: branches/gnome-2-24/addressbook/gui/widgets/e-addressbook-view.c
==============================================================================
--- branches/gnome-2-24/addressbook/gui/widgets/e-addressbook-view.c	(original)
+++ branches/gnome-2-24/addressbook/gui/widgets/e-addressbook-view.c	Thu Oct  9 13:03:41 2008
@@ -1479,9 +1479,8 @@
                         if (subitems[i].image) {
                                 GtkWidget *image;
 
-                                image = gtk_image_new_from_icon_name (
-                                        subitems[i].image,
-                                        GTK_ICON_SIZE_MENU);
+                                image = gtk_image_new_from_file (
+                                        subitems[i].image);
                                 gtk_image_menu_item_set_image (
                                         GTK_IMAGE_MENU_ITEM (menu_item),
                                         image);

Modified: branches/gnome-2-24/calendar/gui/cal-search-bar.c
==============================================================================
--- branches/gnome-2-24/calendar/gui/cal-search-bar.c	(original)
+++ branches/gnome-2-24/calendar/gui/cal-search-bar.c	Thu Oct  9 13:03:41 2008
@@ -552,9 +552,8 @@
                         if (subitems[i].image) {
                                 GtkWidget *image;
 
-                                image = gtk_image_new_from_icon_name (
-                                        subitems[i].image,
-                                        GTK_ICON_SIZE_MENU);
+                                image = gtk_image_new_from_file (
+                                        subitems[i].image);
                                 gtk_image_menu_item_set_image (
                                         GTK_IMAGE_MENU_ITEM (menu_item),
                                         image);