2006-12-16 [colin] 2.6.1cvs44

	* src/toolbar.c
	* src/toolbar.h
		Fix bug 1055, 'Add the 'cancel receive'
		in the available events for the toolbar buttons'

diff --git a/ChangeLog b/ChangeLog
index 6d4c26951096983225ee7e5decbf66d65d194e72..16c9c25568fe300f5b0efc910eb5c36f1e6b7e88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-16 [colin]     2.6.1cvs44
+
+       * src/toolbar.c
+       * src/toolbar.h
+               Fix bug 1055, 'Add the 'cancel receive' 
+               in the available events for the toolbar buttons'
+
 2006-12-16 [colin]     2.6.1cvs43
 
        * po/POTFILES.in

diff --git a/PATCHSETS b/PATCHSETS
index ba7e151d7d2d4986fb9d388f83e13d17909b1bdd..393838fedf78fe18de26ac5c75461a1393fb828b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2151,3 +2151,4 @@
 ( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/bogofilter/bogofilter.h;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/bogofilter/bogofilter_gtk.c;  ) > 2.6.1cvs41.patchset
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/bogofilter/bogofilter_gtk.c;  ) > 2.6.1cvs42.patchset
 ( cvs diff -u -r 1.53.2.20 -r 1.53.2.21 po/POTFILES.in;  cvs diff -u -r 1.179.2.139 -r 1.179.2.140 src/imap.c;  cvs diff -u -r 1.6.2.10 -r 1.6.2.11 src/common/nntp.c;  cvs diff -u -r 1.23.2.10 -r 1.23.2.11 src/common/session.c;  ) > 2.6.1cvs43.patchset
+( cvs diff -u -r 1.43.2.56 -r 1.43.2.57 src/toolbar.c;  cvs diff -u -r 1.19.2.12 -r 1.19.2.13 src/toolbar.h;  ) > 2.6.1cvs44.patchset

diff --git a/configure.ac b/configure.ac
index 2e1562b634dbb84027942225f6da61fc536debe7..f4b948a3a698619a9b0c06e8dff7cedd07b777ce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=43
+EXTRA_VERSION=44
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/toolbar.c b/src/toolbar.c
index ebb579a436a64bf9bc0d09c0aae9d2680d18a038..ce4b37c20ce536ce25f72ad6e66fa201646cbe75 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -154,6 +154,8 @@ static void toolbar_addrbook_cb             (GtkWidget      *widget,
 static void toolbar_check_spelling_cb                  (GtkWidget      *widget, 
                                                 gpointer        data);
 #endif
+static void toolbar_cancel_inc_cb              (GtkWidget      *widget,
+                                                gpointer        data);
 
 struct {
        gchar *index_str;
@@ -192,6 +194,7 @@ struct {
        { "A_CHECK_SPELLING",   N_("Check spelling")                       },
 #endif
        { "A_SYL_ACTIONS",      N_("Claws Mail Actions Feature")           }, 
+       { "A_CANCEL_INC",       N_("Cancel receiving")                     },
        { "A_SEPARATOR",        "Separator"                             }
 };
 
@@ -306,7 +309,7 @@ GList *toolbar_get_action_items(ToolbarType source)
                                        A_REPLY_ALL,     A_REPLY_ML,      A_FORWARD, 
                                        A_TRASH , A_DELETE_REAL,       A_EXECUTE,       A_GOTO_PREV, 
                                        A_GOTO_NEXT,    A_IGNORE_THREAD,  A_PRINT,
-                                       A_ADDRBOOK,     A_LEARN_SPAM, A_SYL_ACTIONS };
+                                       A_ADDRBOOK,     A_LEARN_SPAM, A_SYL_ACTIONS, A_CANCEL_INC };
 
                for (i = 0; i < sizeof main_items / sizeof main_items[0]; i++)  {
                        items = g_list_append(items, gettext(toolbar_text[main_items[i]].descr));
@@ -1220,6 +1223,15 @@ static void toolbar_ignore_thread_cb(GtkWidget *widget, gpointer data)
        }
 }
 
+static void toolbar_cancel_inc_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+
+       g_return_if_fail(toolbar_item != NULL);
+       inc_cancel_all();
+}
+
+
 static void toolbar_print_cb(GtkWidget *widget, gpointer data)
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
@@ -1391,7 +1403,8 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
 #ifdef USE_ASPELL
                { A_CHECK_SPELLING,     toolbar_check_spelling_cb       },
 #endif
-               { A_SYL_ACTIONS,        toolbar_actions_execute_cb      }
+               { A_SYL_ACTIONS,        toolbar_actions_execute_cb      },
+               { A_CANCEL_INC,         toolbar_cancel_inc_cb           }
        };
 
        num_items = sizeof(callbacks)/sizeof(callbacks[0]);
@@ -1750,6 +1763,12 @@ Toolbar *toolbar_create(ToolbarType       type,
 
                        gtk_widget_show(item);
                        break;
+               case A_CANCEL_INC:
+                       toolbar_data->cancel_inc_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            toolbar_data->cancel_inc_btn,
+                                            _("Cancel receiving"), NULL);
+                       break;
                default:
                        /* find and set the tool tip text */
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips),
@@ -1950,6 +1969,10 @@ void toolbar_main_set_sensitive(gpointer data)
                SET_WIDGET_COND(toolbar->learn_spam_btn, 
                        M_TARGET_EXIST|M_CAN_LEARN_SPAM);
 
+       if (toolbar->cancel_inc_btn)
+               SET_WIDGET_COND(toolbar->cancel_inc_btn,
+                               M_INC_ACTIVE);
+
        for (cur = toolbar->action_list; cur != NULL;  cur = cur->next) {
                ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
                

diff --git a/src/toolbar.h b/src/toolbar.h
index f52f5e9444738b6586d8591a0314ff66c5458911..8de1f1a7f78c7da08c39786c17a28e1680a2b134 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -79,7 +79,8 @@ struct _Toolbar {
        GtkWidget *separator;
        GtkWidget *learn_spam_btn;
        GtkWidget *learn_ham_btn;
-
+       GtkWidget *cancel_inc_btn;
+       
        ComposeButtonType compose_btn_type;
        LearnButtonType learn_btn_type;
 
@@ -183,6 +184,8 @@ enum {
 
        /* common items */
        A_SYL_ACTIONS,
+       A_CANCEL_INC,
+
        A_SEPARATOR,
 
        N_ACTION_VAL