2005-01-04 [colin] 0.9.13cvs27.1
authorColin Leroy <colin@colino.net>
Tue, 4 Jan 2005 14:15:27 +0000 (14:15 +0000)
committerColin Leroy <colin@colino.net>
Tue, 4 Jan 2005 14:15:27 +0000 (14:15 +0000)
* src/folderview.c
* src/imap_gtk.c
* src/news_gtk.c
Sync with HEAD

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/folderview.c
src/imap_gtk.c
src/news_gtk.c

index 9d96724..069dd1e 100644 (file)
@@ -1,3 +1,10 @@
+2005-01-04 [colin]     0.9.13cvs27.1
+
+       * src/folderview.c
+       * src/imap_gtk.c
+       * src/news_gtk.c
+               Sync with HEAD
+
 2005-01-04 [colin]     0.9.13cvs25.9
 
        * src/compose.c
index 524ae7d..970509e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.96.2.38 -r 1.96.2.39 src/textview.c; ) > 0.9.13cvs25.7.patchset
 ( cvs diff -u -r 1.382.2.83 -r 1.382.2.84 src/compose.c; ) > 0.9.13cvs25.8.patchset
 ( cvs diff -u -r 1.382.2.84 -r 1.382.2.85 src/compose.c; cvs diff -u -r 1.12.2.5 -r 1.12.2.6 src/prefs_template.c; cvs diff -u -r 1.36.2.19 -r 1.36.2.20 src/common/utils.c; ) > 0.9.13cvs25.9.patchset
+( cvs diff -u -r 1.207.2.23 -r 1.207.2.24 src/folderview.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/imap_gtk.c; cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/news_gtk.c; ) > 0.9.13cvs27.1.patchset
index cd895fe..2cda600 100644 (file)
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=27
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.9
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
index 2d9b6c4..5b2d3b2 100644 (file)
@@ -1429,7 +1429,7 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        SET_SENS("/Mark all read", item->unread_msgs >= 1);
        SET_SENS("/Search folder...", item->total_msgs >= 1 && 
                 folderview->selected == folderview->opened);
-       SET_SENS("/Properties...", TRUE);
+       SET_SENS("/Properties...", item->node->parent != NULL);
        SET_SENS("/Processing...", item->node->parent != NULL);
        if (item == folder->trash)
                SET_SENS("/Empty trash...", folder_item_get_msg_list(item) != NULL);
@@ -1748,11 +1748,10 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       if (folder_item_parent(item) == NULL && item->folder->account)
-               account_open(item->folder->account);
-       else {
-               prefs_folder_item_open(item);
-       }
+       if (folder_item_parent(item) == NULL)
+               return;
+
+       prefs_folder_item_open(item);
 }
 
 static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
index 7bb2f4e..327771b 100644 (file)
@@ -42,6 +42,7 @@
 static void new_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
 static void rename_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
 static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
+static void imap_settings_cb(FolderView *folderview, guint action, GtkWidget *widget);
 static void remove_server_cb(FolderView *folderview, guint action, GtkWidget *widget);
 static void delete_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
 static void update_tree_cb(FolderView *folderview, guint action, GtkWidget *widget);
@@ -59,6 +60,7 @@ static GtkItemFactoryEntry imap_popup_entries[] =
        {N_("/_Check for new messages"), NULL, update_tree_cb,   0, NULL},
        {N_("/R_ebuild folder tree"),    NULL, update_tree_cb,   1, NULL},
        {N_("/---"),                     NULL, NULL,             0, "<Separator>"},
+       {N_("/IMAP4 _account settings"), NULL, imap_settings_cb, 0, NULL},
        {N_("/Remove _IMAP4 account"),   NULL, remove_server_cb, 0, NULL},
        {N_("/---"),                     NULL, NULL,             0, "<Separator>"},
 };
@@ -233,6 +235,17 @@ static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widg
        folderview_move_folder(folderview, from_folder, to_folder);
 }
 
+static void imap_settings_cb(FolderView *folderview, guint action, GtkWidget *widget)
+{
+       FolderItem *item;
+
+       item = folderview_get_selected_item(folderview);
+       if (item == NULL)
+               return;
+
+       account_open(item->folder->account);
+}
+
 static void remove_server_cb(FolderView *folderview, guint action, GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
index 06143c3..0d88f28 100644 (file)
@@ -40,6 +40,7 @@
 
 static void subscribe_newsgroup_cb(FolderView *folderview, guint action, GtkWidget *widget);
 static void unsubscribe_newsgroup_cb(FolderView *folderview, guint action, GtkWidget *widget);
+static void news_settings_cb(FolderView *folderview, guint action, GtkWidget *widget);
 static void remove_news_server_cb(FolderView *folderview, guint action, GtkWidget *widget);
 static void update_tree_cb(FolderView *folderview, guint action, GtkWidget *widget);
 static void download_cb(FolderView *folderview, guint action, GtkWidget *widget);
@@ -53,6 +54,7 @@ static GtkItemFactoryEntry news_popup_entries[] =
        {N_("/---"),                            NULL, NULL,                      0, "<Separator>"},
        {N_("/_Check for new messages"),        NULL, update_tree_cb,            0, NULL},
        {N_("/---"),                            NULL, NULL,                      0, "<Separator>"},
+       {N_("/News _account settings"),         NULL, news_settings_cb,          0, NULL},
        {N_("/Remove _news account"),           NULL, remove_news_server_cb,     0, NULL},
        {N_("/---"),                            NULL, NULL,                      0, "<Separator>"},
 };
@@ -218,6 +220,17 @@ static void unsubscribe_newsgroup_cb(FolderView *folderview, guint action,
        g_free(old_id);
 }
 
+static void news_settings_cb(FolderView *folderview, guint action, GtkWidget *widget)
+{
+       FolderItem *item;
+
+       item = folderview_get_selected_item(folderview);
+       if (item == NULL)
+               return;
+
+       account_open(item->folder->account);
+}
+
 static void remove_news_server_cb(FolderView *folderview, guint action,
                                  GtkWidget *widget)
 {