2010-09-10 [pawel] 3.7.6cvs32

[claws.git] / src / toolbar.c

diff --git a/src/toolbar.c b/src/toolbar.c
index fee5f01a1c6a66e87a1c4626b259da62f63606dd..1b776621ea6de57b65424869616c7d5fd91c2be9 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -352,7 +352,7 @@ static void toolbar_parse_item(XMLFile *file, ToolbarType source)
                if (g_utf8_collate(name, TOOLBAR_ICON_FILE) == 0) 
                        item->file = g_strdup (value);
                else if (g_utf8_collate(name, TOOLBAR_ICON_TEXT) == 0)
-                       item->text = g_strdup (gettext(value));
+                       item->text = g_strdup (*value ? gettext(value):"");
                else if (g_utf8_collate(name, TOOLBAR_ICON_ACTION) == 0)
                        item->index = toolbar_ret_val_from_text(value);
                if (item->index == -1 && !strcmp(value, "A_DELETE")) {
@@ -1737,6 +1737,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
 #ifndef GENERIC_UMPC
 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
+       gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                              \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
@@ -1760,7 +1761,9 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        gchild = gtk_container_get_children(                                                            \
                        GTK_CONTAINER(child));                                                          \
        btn = (GtkWidget *)gchild->data;                                                                \
+       gtk_widget_set_can_focus(btn, FALSE);                                                           \
        arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL);                                      \
+       gtk_widget_set_can_focus(arr, FALSE);                                                           \
        g_list_free(gchild);                                                                            \
        gchild = gtk_container_get_children(GTK_CONTAINER(arr));                                        \
        gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1);                                   \
@@ -1769,6 +1772,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
 #else
 #define TOOLBAR_ITEM(item,icon,text,tooltip) {                                                         \
        item = GTK_WIDGET(gtk_tool_button_new(icon, text));                                             \
+       gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE);                              \
        gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE);                                      \
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE);                                      \
        g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item);     \
@@ -1787,7 +1791,9 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
        gchild = gtk_container_get_children(                                                            \
                        GTK_CONTAINER(child));                                                          \
        btn = (GtkWidget *)gchild->data;                                                                \
+       gtk_widget_set_can_focus(btn, FALSE);                                                           \
        arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL);                                      \
+       gtk_widget_set_can_focus(arr, FALSE);                                                           \
        g_list_free(gchild);                                                                            \
        gchild = gtk_container_get_children(GTK_CONTAINER(arr));                                        \
        gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1);                                   \
@@ -2148,7 +2154,6 @@ Toolbar *toolbar_create(ToolbarType        type,
                item = GTK_WIDGET(gtk_tool_item_new());
                gtk_container_add (GTK_CONTAINER (item), progressbar);
                gtk_widget_show(item);
-               gtk_widget_show(progressbar);
                gtk_widget_set_size_request(progressbar, 70, -1);
                gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1);
                mainwin->progressbar = progressbar;