aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorSuman Manjunath <msuman@src.gnome.org>2008-08-18 12:05:13 +0800
committerSuman Manjunath <msuman@src.gnome.org>2008-08-18 12:05:13 +0800
commitaf89ff7eddf0c3214be4ef23acf235d8540fd157 (patch)
tree1774088193df9698be0d2a181d8a81451039d7ef /shell
parent9159de1212f21a65d310f2a87411c3f0ecaa6bda (diff)
downloadgsoc2013-evolution-af89ff7eddf0c3214be4ef23acf235d8540fd157.tar
gsoc2013-evolution-af89ff7eddf0c3214be4ef23acf235d8540fd157.tar.gz
gsoc2013-evolution-af89ff7eddf0c3214be4ef23acf235d8540fd157.tar.bz2
gsoc2013-evolution-af89ff7eddf0c3214be4ef23acf235d8540fd157.tar.lz
gsoc2013-evolution-af89ff7eddf0c3214be4ef23acf235d8540fd157.tar.xz
gsoc2013-evolution-af89ff7eddf0c3214be4ef23acf235d8540fd157.tar.zst
gsoc2013-evolution-af89ff7eddf0c3214be4ef23acf235d8540fd157.zip
Milan Crha <mcrha@redhat.com> ** Fix for bug #416258 (Evolution "New Mail" icon is wrong size).
svn path=/trunk/; revision=36007
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-user-creatable-items-handler.c13
2 files changed, 19 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 1296ec35c8..74feafdaf9 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-18 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #416258
+
+ * e-user-creatable-items-handler.c (ensure_menu_items),
+ (free_menu_items), (new_button_change), (setup_toolbar_button):
+ Added icon_toolbar for default items which is used instead of menu icon.
+
2008-08-08 Matthew Barnes <mbarnes@redhat.com>
* e-shell-importer.c:
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index f18deeb527..24ba4acd39 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -60,6 +60,7 @@ struct _MenuItem {
char *tooltip;
char *component;
GdkPixbuf *icon;
+ GdkPixbuf *icon_toolbar;
};
typedef struct _MenuItem MenuItem;
@@ -258,8 +259,13 @@ ensure_menu_items (EUserCreatableItemsHandler *handler)
if (corba_item->iconName == NULL || *corba_item->iconName == '\0') {
item->icon = NULL;
+ item->icon_toolbar = NULL;
} else {
item->icon = e_icon_factory_get_icon (corba_item->iconName, E_ICON_SIZE_MENU);
+ if (item_is_default (item, component->alias))
+ item->icon_toolbar = e_icon_factory_get_icon (corba_item->iconName, E_ICON_SIZE_LARGE_TOOLBAR);
+ else
+ item->icon_toolbar = NULL;
}
if (corba_item->type == GNOME_Evolution_CREATABLE_OBJECT)
@@ -304,6 +310,9 @@ free_menu_items (GSList *menu_items)
if (item->icon != NULL)
g_object_unref (item->icon);
+ if (item->icon_toolbar != NULL)
+ g_object_unref (item->icon_toolbar);
+
g_free (item->component);
g_free (item);
}
@@ -698,7 +707,7 @@ new_button_change (GConfClient *gconf,
val = gconf_client_get_string (gconf, "/desktop/gnome/interface/toolbar_style", NULL);
set_combo_button_style (E_COMBO_BUTTON (priv->new_button),
- val, priv->default_menu_item->icon);
+ val, priv->default_menu_item->icon_toolbar ? priv->default_menu_item->icon_toolbar : priv->default_menu_item->icon);
g_free (val);
gtk_widget_show (priv->new_button);
@@ -738,7 +747,7 @@ setup_toolbar_button (EUserCreatableItemsHandler *handler)
gtk_widget_set_sensitive (priv->new_button, TRUE);
set_combo_button_style (E_COMBO_BUTTON (priv->new_button),
- val, priv->default_menu_item->icon);
+ val, priv->default_menu_item->icon_toolbar ? priv->default_menu_item->icon_toolbar : priv->default_menu_item->icon);
gconf_client_notify_add(gconf,"/desktop/gnome/interface/toolbar_style",
(GConfClientNotifyFunc)new_button_change, handler, NULL, NULL);