2007-04-20 [colin] 2.9.1cvs9
authorColin Leroy <colin@colino.net>
Fri, 20 Apr 2007 16:08:36 +0000 (16:08 +0000)
committerColin Leroy <colin@colino.net>
Fri, 20 Apr 2007 16:08:36 +0000 (16:08 +0000)
* src/toolbar.c
Fix bug 1190, 'dir_open' button doesn't work'
(Maemo)

ChangeLog
PATCHSETS
configure.ac
src/toolbar.c

index 01f920c..ca5007f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-20 [colin]     2.9.1cvs9
+
+       * src/toolbar.c
+               Fix bug 1190, 'dir_open' button doesn't work'
+               (Maemo)
+
 2007-04-20 [colin]     2.9.1cvs8
 
        * src/folderview.c
index 5f2727c..841efdb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.371 -r 1.382.2.372 src/compose.c;  ) > 2.9.1cvs6.patchset
 ( cvs diff -u -r 1.50.2.34 -r 1.50.2.35 src/compose.h;  ) > 2.9.1cvs7.patchset
 ( cvs diff -u -r 1.207.2.160 -r 1.207.2.161 src/folderview.c;  cvs diff -u -r 1.274.2.184 -r 1.274.2.185 src/mainwindow.c;  ) > 2.9.1cvs8.patchset
+( cvs diff -u -r 1.43.2.64 -r 1.43.2.65 src/toolbar.c;  ) > 2.9.1cvs9.patchset
index b84799f..710c10e 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 2a21006..6eee1e5 100644 (file)
@@ -187,7 +187,7 @@ struct {
        { "A_IGNORE_THREAD",    N_("Ignore thread")                        },
        { "A_PRINT",            N_("Print")                                },
        { "A_LEARN_SPAM",       N_("Learn Spam or Ham")                    },
-       { "A_GO_FOLDERS",       N_("Go to folder list")                    },
+       { "A_GO_FOLDERS",       N_("Open folder/Go to folder list")        },
 
        { "A_SEND",             N_("Send Message")                         },
        { "A_SENDL",            N_("Put into queue folder and send later") },
@@ -1486,8 +1486,15 @@ static void toolbar_go_folders_cb(GtkWidget *widget, gpointer data)
                return;
        }
 
-       gtk_widget_grab_focus(mainwin->folderview->ctree);
-       mainwindow_exit_folder(mainwin);
+       if (!mainwin->in_folder) {
+               FolderItem *item = folderview_get_selected_item(mainwin->folderview);
+               if (item) {
+                       folderview_select(mainwin->folderview, item);
+               }
+       } else {
+               gtk_widget_grab_focus(mainwin->folderview->ctree);
+               mainwindow_exit_folder(mainwin);
+       }
 }
 
 static void toolbar_buttons_cb(GtkWidget   *widget,