second cumulative gtk2 patch

[claws.git] / src / toolbar.c

diff --git a/src/toolbar.c b/src/toolbar.c
index 4ff1c754e93c41217549560a35915b9fc032f92e..8c986c0f467631290e169106d073fb2fe7d4ad2b 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -526,15 +526,19 @@ void toolbar_save_config_file(ToolbarType source)
                for (cur = toolbar_config[source].item_list; cur != NULL; cur = cur->next) {
                        ToolbarItem *toolbar_item = (ToolbarItem*) cur->data;
                        
-                       if (toolbar_item->index != A_SEPARATOR) 
-                               fprintf(fp, "\t<%s %s=\"%s\" %s=\"%s\" %s=\"%s\"/>\n",
+#warning FIXME_GTK2
+                       if (toolbar_item->index != A_SEPARATOR) {
+                               fprintf(fp, "\t<%s %s=\"%s\" %s=\"",
                                        TOOLBAR_TAG_ITEM, 
                                        TOOLBAR_ICON_FILE, toolbar_item->file,
-                                       TOOLBAR_ICON_TEXT, toolbar_item->text,
+                                       TOOLBAR_ICON_TEXT);
+                               xml_file_put_escape_str(fp, toolbar_item->text);
+                               fprintf(fp, "\" %s=\"%s\"/>\n",
                                        TOOLBAR_ICON_ACTION, 
                                        toolbar_ret_text_from_val(toolbar_item->index));
-                       else 
+                       } else {
                                fprintf(fp, "\t<%s/>\n", TOOLBAR_TAG_SEPARATOR); 
+                       }
                }
 
                fprintf(fp, "</%s>\n", TOOLBAR_TAG_INDEX);      
@@ -870,20 +874,23 @@ static void toolbar_exec_cb(GtkWidget     *widget,
 
 
 /* popup callback functions */
-static void toolbar_reply_popup_cb(GtkWidget       *widget, 
-                                  GdkEventButton  *event, 
-                                  gpointer         data)
+static gboolean toolbar_reply_popup_cb(GtkWidget       *widget, 
+                                      GdkEventButton  *event, 
+                                      gpointer         data)
 {
        Toolbar *toolbar_data = (Toolbar*)data;
        
-       if (!event) return;
+       if (!event) return FALSE;
        
        if (event->button == 3) {
                gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
                gtk_menu_popup(GTK_MENU(toolbar_data->reply_popup), NULL, NULL,
                       menu_button_position, widget,
                       event->button, event->time);
+               return TRUE;
        }
+
+       return FALSE;
 }
 
 static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
@@ -915,18 +922,21 @@ static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer dat
        manage_window_focus_in(window, NULL, NULL);
 }
 
-static void toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        Toolbar *toolbar_data = (Toolbar*)data;
        
-       if (!event) return;
+       if (!event) return FALSE;
        
        if (event->button == 3) {
                gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
                gtk_menu_popup(GTK_MENU(toolbar_data->replyall_popup), NULL, NULL,
                       menu_button_position, widget,
                       event->button, event->time);
+               return TRUE;
        }
+
+       return FALSE;
 }
 
 static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
@@ -958,7 +968,7 @@ static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpoin
        manage_window_focus_in(window, NULL, NULL);
 }
 
-static void toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        Toolbar *toolbar_data = (Toolbar*)data;
 
@@ -967,7 +977,10 @@ static void toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *ev
                gtk_menu_popup(GTK_MENU(toolbar_data->replylist_popup), NULL, NULL,
                       menu_button_position, widget,
                       event->button, event->time);
+               return TRUE;
        }
+
+       return FALSE;
 }
 
 static void toolbar_reply_to_list_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
@@ -997,7 +1010,7 @@ static void toolbar_reply_to_list_popup_closed_cb(GtkMenuShell *menu_shell, gpoi
        manage_window_focus_in(window, NULL, NULL);
 }
 
-static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        Toolbar *toolbar_data = (Toolbar*)data;
 
@@ -1006,7 +1019,10 @@ static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *
                gtk_menu_popup(GTK_MENU(toolbar_data->replysender_popup), NULL, NULL,
                       menu_button_position, widget,
                       event->button, event->time);
+               return TRUE;
        }
+
+       return FALSE;
 }
 
 static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
@@ -1035,7 +1051,7 @@ static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gp
        manage_window_focus_in(window, NULL, NULL);
 }
 
-static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        Toolbar *toolbar_data = (Toolbar*)data;
 
@@ -1044,7 +1060,10 @@ static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, g
                gtk_menu_popup(GTK_MENU(toolbar_data->fwd_popup), NULL, NULL,
                               menu_button_position, widget,
                               event->button, event->time);
+               return TRUE;
        }
+
+       return FALSE;
 }
 
 static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell, 
@@ -1499,13 +1518,11 @@ Toolbar *toolbar_create(ToolbarType      type,
 
        toolbar_data = g_new0(Toolbar, 1); 
 
-       toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
-                                 GTK_TOOLBAR_BOTH);
+       toolbar = gtk_toolbar_new();
        gtk_container_add(GTK_CONTAINER(container), toolbar);
        gtk_container_set_border_width(GTK_CONTAINER(container), 2);
-       gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
-       gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
-                                   GTK_TOOLBAR_SPACE_LINE);
+       gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
+       gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
        
        for (cur = toolbar_list; cur != NULL; cur = cur->next) {
 
@@ -1531,7 +1548,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                                                toolbar_item->text,
                                                (""),
                                                (""),
-                                               icon_wid, toolbar_buttons_cb, 
+                                               icon_wid, G_CALLBACK(toolbar_buttons_cb), 
                                                toolbar_item);
                
                switch (toolbar_item->index) {
@@ -1560,7 +1577,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                                                            _("News"),
                                                            (""),
                                                            (""),
-                                                           icon_news, toolbar_buttons_cb, 
+                                                           icon_news, G_CALLBACK(toolbar_buttons_cb), 
                                                            toolbar_item);
                        toolbar_data->compose_mail_btn = item; 
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
@@ -2035,7 +2052,7 @@ void inc_all_account_mail_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MainWindow *mainwin = (MainWindow*)data;
 
-       inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+       inc_all_account_mail(mainwin, FALSE, prefs_common.newmail_notify_manu);
 }
 
 void send_queue_cb(gpointer data, guint action, GtkWidget *widget)