aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-user-creatable-items-handler.c11
2 files changed, 12 insertions, 6 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 60ee8719d2..76f19f5c33 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-13 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #345331
+
+ * e-user-creatable-items-handler.c: (set_combo_button_style): Default
+ to both style.
+
2006-07-12 Hiroyuki Ikezoe <poincare@ikezoe.net>
** Fixes bug #347182
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index bbd22e8a61..c3f888235f 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -673,12 +673,7 @@ gtk_separator_func (EUserCreatableItemsHandler *handler, gpointer menu, int nth)
static void
set_combo_button_style (EComboButton *button, const gchar *style, GdkPixbuf *icon)
{
- if(!g_ascii_strcasecmp (style,"both")){
- e_combo_button_pack_vbox (button);
- e_combo_button_set_icon (button, icon);
- e_combo_button_set_label (button, _(" New "));
- }
- else if(!g_ascii_strcasecmp (style,"both-horiz")){
+ if(!g_ascii_strcasecmp (style,"both-horiz")){
e_combo_button_pack_hbox (button);
e_combo_button_set_label (button, _("New"));
e_combo_button_set_icon (button, icon);
@@ -692,6 +687,10 @@ set_combo_button_style (EComboButton *button, const gchar *style, GdkPixbuf *ico
e_combo_button_pack_hbox (button);
e_combo_button_set_label (button, _("New"));
e_combo_button_set_icon (button, NULL);
+ } else { /* Default to both */
+ e_combo_button_pack_vbox (button);
+ e_combo_button_set_icon (button, icon);
+ e_combo_button_set_label (button, _(" New "));
}
}