From: Colin Leroy Date: Sat, 1 Jan 2005 14:14:08 +0000 (+0000) Subject: 2005-01-01 [colin] 0.9.13cvs24.2 X-Git-Tag: gtk2_win32_last_merge~19 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=40c0a4e5cf96fc5fea87339c19148fc74130330b 2005-01-01 [colin] 0.9.13cvs24.2 * src/prefs_actions.c Fix over-zealous assertion. Patch by Alfons --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 5bd84c3e9..0563575e9 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2005-01-01 [colin] 0.9.13cvs24.2 + + * src/prefs_actions.c + Fix over-zealous assertion. Patch by Alfons + 2005-01-01 [colin] 0.9.13cvs24.1 * src/procmime.c diff --git a/PATCHSETS b/PATCHSETS index 60fa08f78..53aa129cb 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -298,3 +298,4 @@ ( cvs diff -u -r 1.654.2.330 -r 1.654.2.331 configure.ac; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/pluginwindow.c; ) > 0.9.13cvs23.1.patchset ( cvs diff -u -r 1.204.2.26 -r 1.204.2.27 src/prefs_common.c; ) > 0.9.13cvs23.2.patchset ( cvs diff -u -r 1.49.2.28 -r 1.49.2.29 src/procmime.c; ) > 0.9.13cvs24.1.patchset +( cvs diff -u -r 1.60.2.7 -r 1.60.2.8 src/prefs_actions.c; ) > 0.9.13cvs24.2.patchset diff --git a/configure.ac b/configure.ac index b8704fd8e..32c5f30af 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=24 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.1 +EXTRA_GTK2_VERSION=.2 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/prefs_actions.c b/src/prefs_actions.c index f0fb6ecd0..43987fc82 100644 --- a/src/prefs_actions.c +++ b/src/prefs_actions.c @@ -534,14 +534,26 @@ static void prefs_actions_register_cb(GtkWidget *w, gpointer data) static void prefs_actions_substitute_cb(GtkWidget *w, gpointer data) { - GtkTreeIter sel; + GtkTreeIter isel, inew; + GtkTreePath *path_sel, *path_new; + GtkTreeSelection *selection = gtk_tree_view_get_selection + (GTK_TREE_VIEW(actions.actions_list_view)); + GtkTreeModel *model; - if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection - (GTK_TREE_VIEW(actions.actions_list_view)), - NULL, &sel)) + if (!gtk_tree_selection_get_selected(selection, &model, &isel)) + return; + if (!gtk_tree_model_get_iter_first(model, &inew)) return; - prefs_actions_clist_set_row(&sel); + path_sel = gtk_tree_model_get_path(model, &isel); + path_new = gtk_tree_model_get_path(model, &inew); + + if (path_sel && path_new + && gtk_tree_path_compare(path_sel, path_new) != 0) + prefs_actions_clist_set_row(&isel); + + gtk_tree_path_free(path_sel); + gtk_tree_path_free(path_new); } static void prefs_actions_delete_cb(GtkWidget *w, gpointer data) @@ -776,10 +788,6 @@ static void prefs_actions_list_view_insert_action(GtkWidget *list_view, PREFS_ACTIONS_DATA, &old_action, -1); - /* NOTE: we assume we never change the first entry, - * which is "(New)" */ - g_assert(strcmp(_("New"), old_action) != 0); - g_free(old_action); gtk_list_store_set(list_store, row_iter, PREFS_ACTIONS_STRING, action,