2006-02-22 [wwp] 2.0.0cvs71
authorTristan Chabredier <wwp@claws-mail.org>
Wed, 22 Feb 2006 19:25:38 +0000 (19:25 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Wed, 22 Feb 2006 19:25:38 +0000 (19:25 +0000)
* src/prefs_toolbar.c
fix a crash when adding separators to toolbars,
also fix some separator item information.

ChangeLog
PATCHSETS
configure.ac
src/prefs_toolbar.c

index d8bc3b0e1b2638e3609d5f4b1b558e2861d39385..4d161860d818f944ab9c4382b708b2f1d72c4f24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-22 [wwp]       2.0.0cvs71
+
+       * src/prefs_toolbar.c
+               fix a crash when adding separators to toolbars,
+               also fix some separator item information.
+
 2006-02-22 [wwp]       2.0.0cvs70
 
        * src/compose.c
index c71d5a04cf83aca36f896d8b1a270e7965e19039..c8734fdca3a914f7d3fac52562606e65166e7b59 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/gtkutils.c;  ) > 2.0.0cvs68.patchset
 ( cvs diff -u -r 1.395.2.172 -r 1.395.2.173 src/summaryview.c;  cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.0.0cvs69.patchset
 ( cvs diff -u -r 1.382.2.243 -r 1.382.2.244 src/compose.c;  ) > 2.0.0cvs70.patchset
+( cvs diff -u -r 1.30.2.23 -r 1.30.2.24 src/prefs_toolbar.c;  ) > 2.0.0cvs71.patchset
index d7891d98e747e6d21b572e9bd6d7bbca96279a98..d486a09cd42829eb1171e0e8ea2c5d409345afea 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=70
+EXTRA_VERSION=71
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 0d2fc8c62acee92477ba7b195f9f9ebb11b093c8..eea846ac8ef1e57574ef42565b9811b2d1270d3a 100644 (file)
@@ -408,7 +408,7 @@ static void prefs_toolbar_register(GtkButton *button, ToolbarPage *prefs_toolbar
                gtk_list_store_append(store_set, &iter);
                gtk_list_store_set(store_set, &iter,
                                   SET_ICON, NULL,
-                                  SET_FILENAME, NULL,
+                                  SET_FILENAME, toolbar_ret_descr_from_val(A_SEPARATOR),
                                   SET_TEXT, NULL,
                                   SET_EVENT, toolbar_ret_descr_from_val(A_SEPARATOR),
                                   SET_ICON_TEXT, (const gchar *) SEPARATOR_PIXMAP,
@@ -1153,7 +1153,7 @@ static gboolean set_list_selected(GtkTreeSelection *selector,
        gint item_num;
        GtkTreeModel *model_ico;
        
-       if (currently_selected ||!gtk_tree_model_get_iter(model, &iter, path))
+       if (currently_selected || !gtk_tree_model_get_iter(model, &iter, path))
                return TRUE;
        
        gtk_tree_model_get(model, &iter,
@@ -1162,7 +1162,12 @@ static gboolean set_list_selected(GtkTreeSelection *selector,
                           SET_EVENT, &descr,
                           -1);
 
-       if (g_utf8_collate(descr, syl_act)) 
+       /* Separator */
+       if (icon_text == NULL) {
+               return TRUE;
+       }
+
+       if (g_utf8_collate(descr, syl_act))
                gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->entry_icon_text), 
                                   icon_text);