aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-10-09 21:03:41 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-10-09 21:03:41 +0800
commitb65b8d3cd73e1fb9f9a74b916e509c0fb9917cc6 (patch)
treee5f3dec30a2746a4fc5373a6cbbd83fb32f3e012
parent31b65540022534fed8dd1f51b35ec31d56f401ef (diff)
downloadgsoc2013-evolution-b65b8d3cd73e1fb9f9a74b916e509c0fb9917cc6.tar
gsoc2013-evolution-b65b8d3cd73e1fb9f9a74b916e509c0fb9917cc6.tar.gz
gsoc2013-evolution-b65b8d3cd73e1fb9f9a74b916e509c0fb9917cc6.tar.bz2
gsoc2013-evolution-b65b8d3cd73e1fb9f9a74b916e509c0fb9917cc6.tar.lz
gsoc2013-evolution-b65b8d3cd73e1fb9f9a74b916e509c0fb9917cc6.tar.xz
gsoc2013-evolution-b65b8d3cd73e1fb9f9a74b916e509c0fb9917cc6.tar.zst
gsoc2013-evolution-b65b8d3cd73e1fb9f9a74b916e509c0fb9917cc6.zip
** Fixes bug #555494
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. svn path=/branches/gnome-2-24/; revision=36582
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c5
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/cal-search-bar.c5
4 files changed, 18 insertions, 6 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 9dcff728c4..a025ea021c 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-09 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #555494
+
+ * gui/widgets/e-addressbook-view.c (generate_viewoption_menu):
+ Category icons are not themed. Load by file, not by icon name.
+
2008-10-03 Sankar P <psankar@novell.com>
License Changes
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index b85b2324b9..cda3922a87 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1479,9 +1479,8 @@ generate_viewoption_menu (EABSearchBarItem *subitems)
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);
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d9b2547013..d2f3945f2f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-09 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #555494
+
+ * gui/cal-search-bar.c (generate_viewoption_menu):
+ Category icons are not themed. Load by file, not by icon name.
+
2008-10-08 Sankar P <psankar@novell.com>
License Changes
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 3bd1e09bc2..9ea91f8350 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -552,9 +552,8 @@ generate_viewoption_menu (CALSearchBarItem *subitems)
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);