2008-12-07 [paul] 3.6.1cvs62

	* src/prefs_account.c
	* src/gtk/pluginwindow.c
	* src/gtk/prefswindow.c
	* src/gtk/prefswindow.h
		auto-select first page

diff --git a/ChangeLog b/ChangeLog
index 4c879b8f88359995eb21ddec0303005bd0f64e13..d72979cb69f4441e8fd2c3de4641f8733b7cd259 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-07 [paul]      3.6.1cvs62
+
+       * src/prefs_account.c
+       * src/gtk/pluginwindow.c
+       * src/gtk/prefswindow.c
+       * src/gtk/prefswindow.h
+               auto-select first page
+
 2008-12-05 [colin]     3.6.1cvs61
 
        * src/codeconv.c

diff --git a/PATCHSETS b/PATCHSETS
index 460515713058276cb5345056560b3138d40b50f8..fec44ba9ddefa018b7a267a7b59ec27099fb751f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3643,3 +3643,4 @@
 ( cvs diff -u -r 1.16.2.62 -r 1.16.2.63 src/msgcache.c;  cvs diff -u -r 1.395.2.401 -r 1.395.2.402 src/summaryview.c;  cvs diff -u -r 1.1.4.51 -r 1.1.4.52 src/gtk/gtksctree.c;  ) > 3.6.1cvs59.patchset
 ( 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

diff --git a/configure.ac b/configure.ac
index 76c2864866df10a5e0c4281d17a28dcff1d68132..a218d05c56a3ec75409fec6119dc04a7dbe73302 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=61
+EXTRA_VERSION=62
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index 70a6a4470bd7f6d7953c2ad12772126fe3675c42..8b30d5f96d2209cd85427be3c96300abe1b4bad6 100644 (file)
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -136,11 +136,16 @@ static void set_plugin_list(PluginWindow *pluginwindow)
                                   -1);
        }
 
-       if (pluginwindow->selected_plugin == NULL) { 
-               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW
-                               (pluginwindow->plugin_list_view));
-               gtk_tree_selection_unselect_all(selection);                             
-       }               
+       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;
+               }
+               gtk_tree_selection_select_iter(selection, &iter);
+       }
+               
        g_slist_free(plugins);
 }
 

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 292daedf2f6b2d9b7074f8ffe3e2a06b08350a4e..e272d98965f530a261bcbb2f6ab6408f67128f52 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -309,8 +309,7 @@ static void prefswindow_build_all_pages(PrefsWindow *prefswindow, GSList *prefs_
 
 static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
                                                                        PrefsWindow *prefswindow,
-                                                                       gboolean preload_pages,
-                                                                       gboolean activate_child)
+                                                                       gboolean preload_pages)
 {
        GtkTreeStore *store = GTK_TREE_STORE(gtk_tree_view_get_model
                        (GTK_TREE_VIEW(tree_view)));
@@ -401,7 +400,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
 #ifndef GENERIC_UMPC
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
        if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
-               if (activate_child && gtk_tree_model_iter_has_child(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;
@@ -414,7 +413,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
 void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
                                                         gpointer data, GDestroyNotify func,
                                                         gint *save_width, gint *save_height,
-                                                        gboolean preload_pages, gboolean activate_child,
+                                                        gboolean preload_pages,
                                                         PrefsOpenCallbackFunc open_cb,
                                                         PrefsCloseCallbackFunc close_cb)
 {
@@ -510,7 +509,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        gtk_container_add(GTK_CONTAINER(prefswindow->notebook), prefswindow->empty_page);
 
        prefswindow_build_tree(prefswindow->tree_view, prefs_pages, prefswindow,
-                                                       preload_pages, activate_child);
+                                                       preload_pages);
 
        if (open_cb)
                open_cb(GTK_WINDOW(prefswindow->window));
@@ -609,7 +608,7 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
                                         PrefsCloseCallbackFunc close_cb)
 {
        prefswindow_open_full(title, prefs_pages, data, NULL, save_width, save_height,
-                                                 FALSE, FALSE, open_cb, close_cb);
+                                                 FALSE, open_cb, close_cb);
 }
 
 /*!

diff --git a/src/gtk/prefswindow.h b/src/gtk/prefswindow.h
index dfda16b9e9b8f81db4127645f7d906d721e3a40c..ae5f1a310d790d67dd2f8b6647c2f2c18eb6d291 100644 (file)
--- a/src/gtk/prefswindow.h
+++ b/src/gtk/prefswindow.h
@@ -50,7 +50,7 @@ void prefswindow_open_full            (const gchar *title,
                                         gpointer data,
                                         GDestroyNotify func,
                                         gint *save_width, gint *save_height,
-                                        gboolean preload_pages, gboolean activate_child,
+                                        gboolean preload_pages,
                                         PrefsOpenCallbackFunc open_cb,
                                         PrefsCloseCallbackFunc close_cb);
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 73efe838cb315e93c02bf6c9862d819d346a254f..d3f750ffe69943cd1a0245ef592cd48cbdbf20e6 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -3587,8 +3587,7 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs, gboolean *dirty)
 
        prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog,
                        &prefs_common.editaccountwin_width, &prefs_common.editaccountwin_height,
-                       TRUE, TRUE,
-                       NULL, NULL);
+                       TRUE, NULL, NULL);
        g_free(title);
        gtk_main();