talons

commit abd96f87300f2e12231830798d79659d5dabfc62
parent 855cf8d4df42c38a034ede387eabbb6c42be52f5
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sun,  7 Dec 2008 05:35:41 +0000

2008-12-07 [paul]	3.6.1cvs63

	* src/prefs_actions.c
		don't auto-select first entry (same as other
		similar dialogs)
	* src/gtk/pluginwindow.c
		these parents don't have children so don't look
		for them

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/pluginwindow.c
 | 
8
+-------
M
src/prefs_actions.c
 | 
9
---------

5 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-07 [paul]	3.6.1cvs63
+
+	* src/prefs_actions.c
+		don't auto-select first entry (same as other
+		similar dialogs)
+	* src/gtk/pluginwindow.c
+		these parents don't have children so don't look
+		for them
+
 2008-12-07 [paul]	3.6.1cvs62
 
 	* src/prefs_account.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3644,3 +3644,4 @@
 ( cvs diff -u -r 1.103.2.118 -r 1.103.2.119 src/prefs_common.h;  ) > 3.6.1cvs60.patchset
 ( cvs diff -u -r 1.65.2.63 -r 1.65.2.64 src/codeconv.c;  cvs diff -u -r 1.49.2.122 -r 1.49.2.123 src/procmime.c;  ) > 3.6.1cvs61.patchset
 ( cvs diff -u -r 1.105.2.148 -r 1.105.2.149 src/prefs_account.c;  cvs diff -u -r 1.5.2.54 -r 1.5.2.55 src/gtk/pluginwindow.c;  cvs diff -u -r 1.12.2.49 -r 1.12.2.50 src/gtk/prefswindow.c;  cvs diff -u -r 1.7.2.13 -r 1.7.2.14 src/gtk/prefswindow.h;  ) > 3.6.1cvs62.patchset
+( cvs diff -u -r 1.60.2.66 -r 1.60.2.67 src/prefs_actions.c;  cvs diff -u -r 1.5.2.55 -r 1.5.2.56 src/gtk/pluginwindow.c;  ) > 3.6.1cvs63.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=62
+EXTRA_VERSION=63
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
@@ -137,14 +137,8 @@ static void set_plugin_list(PluginWindow *pluginwindow)
 	}
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pluginwindow->plugin_list_view));
-	if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
-		if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) {
-			GtkTreeIter parent = iter;
-			if (!gtk_tree_model_iter_children(GTK_TREE_MODEL(store), &iter, &parent))
-				iter = parent;
-		}
+	if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
 		gtk_tree_selection_select_iter(selection, &iter);
-	}
 		
 	g_slist_free(plugins);
 }
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
@@ -536,8 +536,6 @@ static void prefs_actions_set_dialog(void)
 {
 	GtkListStore *store;
 	GSList *cur;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
 
 	store = GTK_LIST_STORE(gtk_tree_view_get_model
 				(GTK_TREE_VIEW(actions.actions_list_view)));
@@ -550,13 +548,6 @@ static void prefs_actions_set_dialog(void)
 		prefs_actions_list_view_insert_action(actions.actions_list_view,
 						      -1, action, TRUE);
 	}
-
-	/* select first entry */
-	selection = gtk_tree_view_get_selection
-		(GTK_TREE_VIEW(actions.actions_list_view));
-	if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store),
-					  &iter))
-		gtk_tree_selection_select_iter(selection, &iter);
 }
 
 static void prefs_actions_set_list(void)