2007-11-07 [paul] 3.0.2cvs123
authorPaul Mangan <paul@claws-mail.org>
Wed, 7 Nov 2007 09:21:19 +0000 (09:21 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 7 Nov 2007 09:21:19 +0000 (09:21 +0000)
* src/prefs_toolbar.c
* src/toolbar.c
* src/toolbar.h
rename ToolbarSylpheedActions to ToolbarClawsActions
rename A_SYL_ACTIONS to A_CLAWS_ACTIONS

ChangeLog
PATCHSETS
configure.ac
src/prefs_toolbar.c
src/toolbar.c
src/toolbar.h

index b32f66cedbba93ba3a7f674ee0b6d69b504ac886..7b6c8ab808eb120109beeb8b39e31d0d17639c3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-07 [paul]      3.0.2cvs123
+
+       * src/prefs_toolbar.c
+       * src/toolbar.c
+       * src/toolbar.h
+               rename ToolbarSylpheedActions to ToolbarClawsActions
+               rename A_SYL_ACTIONS to A_CLAWS_ACTIONS
+
 2007-11-07 [paul]      3.0.2cvs122
 
        * src/toolbar.c
index f1c5abfc5d996fea84ea42edf51956d86b516392..17664f28b63dc7b6b7c08259d0813c0ac14dd394 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_summary_open.c;  ) > 3.0.2cvs120.patchset
 ( cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/plugins/pgpinline/pgpinline.c;  ) > 3.0.2cvs121.patchset
 ( cvs diff -u -r 1.43.2.90 -r 1.43.2.91 src/toolbar.c;  ) > 3.0.2cvs122.patchset
+( cvs diff -u -r 1.30.2.46 -r 1.30.2.47 src/prefs_toolbar.c;  cvs diff -u -r 1.43.2.91 -r 1.43.2.92 src/toolbar.c;  cvs diff -u -r 1.19.2.25 -r 1.19.2.26 src/toolbar.h;  ) > 3.0.2cvs123.patchset
index cb71f0970fff449982316f5e505228c857170cfa..4f211890bb139bb9f61ad7ee2b9d3a8105218884 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=122
+EXTRA_VERSION=123
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index feaa4d83571ead127ba238d978836586789d6780..53f88d09e5fd8b52ba112359ec4a5d11e8e61783 100644 (file)
@@ -256,7 +256,7 @@ static void prefs_toolbar_save(PrefsPage *_page)
                        item->index = toolbar_ret_val_from_descr(event);
                        g_free(event);
 
-                       /* TODO: save A_SYL_ACTIONS only if they are still active */
+                       /* TODO: save A_CLAWS_ACTIONS only if they are still active */
                        toolbar_set_list_item(item, prefs_toolbar->source);
 
                        g_free(item->file);
@@ -468,7 +468,7 @@ static void prefs_toolbar_register(GtkButton *button, ToolbarPage *prefs_toolbar
                                return;
                        }
                } else
-                       event = toolbar_ret_descr_from_val(A_SYL_ACTIONS);
+                       event = toolbar_ret_descr_from_val(A_CLAWS_ACTIONS);
                
                text = gtk_editable_get_chars(
                        GTK_EDITABLE(prefs_toolbar->item_text_entry), 0 , -1);
@@ -554,7 +554,7 @@ static void prefs_toolbar_substitute(GtkButton *button, ToolbarPage *prefs_toolb
                                return;
                        }
                } else
-                       icon_event = toolbar_ret_descr_from_val(A_SYL_ACTIONS);
+                       icon_event = toolbar_ret_descr_from_val(A_CLAWS_ACTIONS);
                
                text = gtk_editable_get_chars(
                        GTK_EDITABLE(prefs_toolbar->item_text_entry), 0 , -1);
@@ -1192,7 +1192,7 @@ static gboolean set_list_selected(GtkTreeSelection *selector,
        gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), 
                           icon_text);
 
-       if (g_utf8_collate(toolbar_ret_descr_from_val(A_SYL_ACTIONS), descr) == 0) {
+       if (g_utf8_collate(toolbar_ret_descr_from_val(A_CLAWS_ACTIONS), descr) == 0) {
                gtk_combo_box_set_active(GTK_COMBO_BOX(
                        prefs_toolbar->item_type_combo), ITEM_USER_ACTION);
 
index 90c573b1c607ea1a76d921159602130aa3a591d3..fdef575862de84a76a55e5d02abdeaa6d87c2d33 100644 (file)
@@ -208,7 +208,7 @@ struct {
 #ifdef USE_ASPELL
        { "A_CHECK_SPELLING",   N_("Check spelling")                       },
 #endif
-       { "A_SYL_ACTIONS",      N_("Claws Mail Actions Feature")           }, 
+       { "A_CLAWS_ACTIONS",    N_("Claws Mail Actions Feature")           }, 
        { "A_CANCEL_INC",       N_("Cancel receiving")                     },
        { "A_CLOSE",            N_("Close window")                         },
        { "A_SEPARATOR",        "Separator"                             }
@@ -304,7 +304,7 @@ static gboolean toolbar_is_duplicate(gint action, ToolbarType source)
 {
        GSList *cur;
 
-       if ((action == A_SEPARATOR) || (action == A_SYL_ACTIONS)) 
+       if ((action == A_SEPARATOR) || (action == A_CLAWS_ACTIONS)) 
                return FALSE;
 
        for (cur = toolbar_config[source].item_list; cur != NULL; cur = cur->next) {
@@ -836,7 +836,7 @@ static void toolbar_action_execute(GtkWidget    *widget,
        gint i = 0;
 
        for (cur = action_list; cur != NULL;  cur = cur->next) {
-               ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
+               ToolbarClawsActions *act = (ToolbarClawsActions*)cur->data;
 
                if (widget == act->widget) {
                        
@@ -1702,7 +1702,7 @@ 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_CLAWS_ACTIONS,      toolbar_actions_execute_cb      },
                { A_CANCEL_INC,         toolbar_cancel_inc_cb           }
        };
 
@@ -1803,7 +1803,7 @@ Toolbar *toolbar_create(ToolbarType        type,
        GtkWidget *menu;
        guint n_menu_entries;
        GtkItemFactory *factory;
-       ToolbarSylpheedActions *action_item;
+       ToolbarClawsActions *action_item;
        GSList *cur;
        GSList *toolbar_list;
        Toolbar *toolbar_data;
@@ -2046,9 +2046,9 @@ Toolbar *toolbar_create(ToolbarType        type,
                        break;
 #endif
 
-               case A_SYL_ACTIONS:
+               case A_CLAWS_ACTIONS:
                        TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,toolbar_item->text);
-                       action_item = g_new0(ToolbarSylpheedActions, 1);
+                       action_item = g_new0(ToolbarClawsActions, 1);
                        action_item->widget = item;
                        action_item->name   = g_strdup(toolbar_item->text);
 
@@ -2343,7 +2343,7 @@ void toolbar_main_set_sensitive(gpointer data)
                                M_INC_ACTIVE);
 
        for (cur = toolbar->action_list; cur != NULL;  cur = cur->next) {
-               ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
+               ToolbarClawsActions *act = (ToolbarClawsActions*)cur->data;
                
                SET_WIDGET_COND(act->widget, M_TARGET_EXIST|M_UNLOCKED);
        }
@@ -2406,7 +2406,7 @@ void toolbar_comp_set_sensitive(gpointer data, gboolean sensitive)
                GTK_BUTTON_SET_SENSITIVE(compose->toolbar->spellcheck_btn, sensitive);
 #endif
        for (; items != NULL; items = g_slist_next(items)) {
-               ToolbarSylpheedActions *item = (ToolbarSylpheedActions *)items->data;
+               ToolbarClawsActions *item = (ToolbarClawsActions *)items->data;
                GTK_BUTTON_SET_SENSITIVE(item->widget, sensitive);
        }
 }
index ea37aeaebb6d9c9025364794e9132d2d1669d9fe..3c7b640face78028914ee0bae2519a2935c21d5c 100644 (file)
@@ -26,7 +26,7 @@
 
 typedef struct _Toolbar Toolbar;
 typedef struct _ToolbarItem ToolbarItem;
-typedef struct _ToolbarSylpheedActions ToolbarSylpheedActions;
+typedef struct _ToolbarClawsActions ToolbarClawsActions;
 
 typedef enum {
        TOOLBAR_MAIN = 0,       
@@ -129,9 +129,9 @@ struct _ToolbarItem {
 
 #define TOOLBAR_DESTROY_ACTIONS(action_list) \
 { \
-       ToolbarSylpheedActions *action; \
+       ToolbarClawsActions *action; \
        while (action_list != NULL) { \
-               action = (ToolbarSylpheedActions*)action_list->data;\
+               action = (ToolbarClawsActions*)action_list->data;\
                action_list = \
                        g_slist_remove(action_list, action);\
                if (action->name) \
@@ -187,7 +187,7 @@ enum {
 #endif
 
        /* common items */
-       A_SYL_ACTIONS,
+       A_CLAWS_ACTIONS,
        A_CANCEL_INC,
        A_CLOSE,
 
@@ -196,7 +196,7 @@ enum {
        N_ACTION_VAL
 };
 
-struct _ToolbarSylpheedActions {
+struct _ToolbarClawsActions {
        GtkWidget *widget;
        gchar     *name;
 };