summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Deering <ben_deering@swissmail.org>2012-12-19 07:38:35 -0500
committerMartin Jansa <Martin.Jansa@gmail.com>2012-12-19 17:48:22 +0100
commit86cb85e8c0b3b655f294163b70b50406b33dca1e (patch)
tree4e01f37f6a7fe1609db279dc2eb5dca2b9be208f
parent306cf7689c473feddf6b17530c6a557301e26e12 (diff)
downloadmeta-openembedded-86cb85e8c0b3b655f294163b70b50406b33dca1e.tar.gz
claws-plugin-mailmbox: upgrade to 1.15
Signed-off-by: Ben Deering <ben_deering@swissmail.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat
-rw-r--r--meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox-1.14/claws-plugin-mailmbox-fixup.patch218
-rw-r--r--meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.15.bb (renamed from meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb)8
2 files changed, 3 insertions, 223 deletions
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox-1.14/claws-plugin-mailmbox-fixup.patch b/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox-1.14/claws-plugin-mailmbox-fixup.patch
deleted file mode 100644
index f8cce25225..0000000000
--- a/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox-1.14/claws-plugin-mailmbox-fixup.patch
+++ /dev/null
@@ -1,218 +0,0 @@
1Index: mailmbox-1.14/src/plugin_gtk.c
2===================================================================
3--- mailmbox-1.14.orig/src/plugin_gtk.c 2008-12-04 06:18:50.000000000 +0300
4+++ mailmbox-1.14/src/plugin_gtk.c 2008-12-04 06:49:40.000000000 +0300
5@@ -35,39 +35,41 @@
6
7 #include "pluginconfig.h"
8
9-static void new_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
10-static void delete_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
11-static void rename_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
12-static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget);
13-static void update_tree_cb(FolderView *folderview, guint action, GtkWidget *widget);
14-static void remove_mailbox_cb(FolderView *folderview, guint action, GtkWidget *widget);
15-static void add_mailbox(gpointer callback_data, guint callback_action, GtkWidget *widget);
16-
17-static GtkItemFactoryEntry claws_mailmbox_popup_entries[] =
18-{
19- {N_("/Create _new folder..."), NULL, new_folder_cb, 0, NULL},
20- {N_("/---"), NULL, NULL, 0, "<Separator>"},
21- {N_("/_Rename folder..."), NULL, rename_folder_cb, 0, NULL},
22- {N_("/M_ove folder..."), NULL, move_folder_cb, 0, NULL},
23- {N_("/Cop_y folder..."), NULL, move_folder_cb, 1, NULL},
24- {N_("/---"), NULL, NULL, 0, "<Separator>"},
25- {N_("/_Delete folder"), NULL, delete_folder_cb, 0, NULL},
26- {N_("/---"), NULL, NULL, 0, "<Separator>"},
27- {N_("/_Check for new messages"), NULL, update_tree_cb, 0, NULL},
28- {N_("/C_heck for new folders"), NULL, update_tree_cb, 1, NULL},
29- {N_("/R_ebuild folder tree"), NULL, update_tree_cb, 2, NULL},
30- {N_("/---"), NULL, NULL, 0, "<Separator>"},
31- {N_("/Remove _mailbox"), NULL, remove_mailbox_cb, 0, NULL},
32- {N_("/---"), NULL, NULL, 0, "<Separator>"},
33+static void new_folder_cb(GtkAction *action, gpointer data);
34+static void delete_folder_cb(GtkAction *action, gpointer data);
35+static void rename_folder_cb(GtkAction *action, gpointer data);
36+static void move_folder_cb(GtkAction *action, gpointer data);
37+static void update_tree_cb(GtkAction *action, gpointer data);
38+static void remove_mailbox_cb(GtkAction *action, gpointer data);
39+static void add_mailbox(gpointer callback_data, guint callback_action, gpointer data);
40+
41+static GtkActionEntry claws_mailmbox_popup_entries[] =
42+{
43+ {"FolderViewPopup/CreateNewFolder", NULL, N_("/Create _new folder..."), NULL, NULL, G_CALLBACK(new_folder_cb) },
44+ {"FolderViewPopup/---", NULL, N_("/---") },
45+ {"FolderViewPopup/RenameFolder", NULL, N_("/_Rename folder..."), NULL, NULL, G_CALLBACK(rename_folder_cb) },
46+ {"FolderViewPopup/MoveFolder", NULL, N_("/M_ove folder..."), NULL, NULL, G_CALLBACK(move_folder_cb) },
47+ {"FolderViewPopup/CopyFolder", NULL, N_("/Cop_y folder..."), NULL, NULL, G_CALLBACK(move_folder_cb) },
48+ {"FolderViewPopup/---", NULL, N_("/---") },
49+ {"FolderViewPopup/DeleteFolder", NULL, N_("/_Delete folder"), NULL, NULL, G_CALLBACK(delete_folder_cb) },
50+ {"FolderViewPopup/---", NULL, N_("/---") },
51+ {"FolderViewPopup/CheckNewMessages", NULL, N_("/_Check for new messages"), NULL, NULL, G_CALLBACK(update_tree_cb) },
52+ {"FolderViewPopup/CheckNewFolders", NULL, N_("/C_heck for new folders"), NULL, NULL, G_CALLBACK(update_tree_cb) },
53+ {"FolderViewPopup/RebuildfTree", NULL, N_("/R_ebuild folder tree"), NULL, NULL, G_CALLBACK(update_tree_cb) },
54+ {"FolderViewPopup/---", NULL, N_("/---") },
55+ {"FolderViewPopup/RemoveMailbox", NULL, N_("/Remove _mailbox"), NULL, NULL, G_CALLBACK(remove_mailbox_cb) },
56 };
57
58-static void set_sensitivity(GtkItemFactory *factory, FolderItem *item);
59+static void set_sensitivity(GtkUIManager *factory, FolderItem *item);
60
61 static FolderViewPopup claws_mailmbox_popup =
62 {
63 "mailmbox",
64 "<MailmboxFolder>",
65- NULL,
66+ claws_mailmbox_popup_entries,
67+ G_N_ELEMENTS(claws_mailmbox_popup_entries),
68+ NULL, 0,
69+ NULL, 0, 0, NULL, NULL,
70 set_sensitivity
71 };
72
73@@ -85,11 +87,6 @@
74 GtkItemFactory *ifactory;
75 MainWindow *mainwin = mainwindow_get_mainwindow();
76
77- n_entries = sizeof(claws_mailmbox_popup_entries) /
78- sizeof(claws_mailmbox_popup_entries[0]);
79- for (i = 0; i < n_entries; i++)
80- claws_mailmbox_popup.entries = g_slist_append(claws_mailmbox_popup.entries, &claws_mailmbox_popup_entries[i]);
81-
82 folderview_register_popup(&claws_mailmbox_popup);
83
84 ifactory = gtk_item_factory_from_widget(mainwin->menubar);
85@@ -115,7 +112,7 @@
86 gtk_item_factory_delete_item(ifactory, mainwindow_add_mailbox.path);
87 }
88
89-static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
90+static void set_sensitivity(GtkUIManager *factory, FolderItem *item)
91 {
92 #define SET_SENS(name, sens) \
93 menu_set_sensitive(factory, name, sens)
94@@ -132,10 +129,13 @@
95 #undef SET_SENS
96 }
97
98-static void update_tree_cb(FolderView *folderview, guint action,
99- GtkWidget *widget)
100+#define DO_ACTION(name, act) { if (!strcmp(a_name, name)) act; }
101+
102+static void update_tree_cb(GtkAction *action, gpointer data)
103 {
104+ FolderView *folderview = (FolderView *)data;
105 FolderItem *item;
106+ const gchar *a_name = gtk_action_get_name(action);
107
108 item = folderview_get_selected_item(folderview);
109 g_return_if_fail(item != NULL);
110@@ -144,16 +144,12 @@
111
112 g_return_if_fail(item->folder != NULL);
113
114- if (action == 0)
115- folderview_check_new(item->folder);
116- else if (action == 1)
117- folderview_rescan_tree(item->folder, FALSE);
118- else if (action == 2)
119- folderview_rescan_tree(item->folder, TRUE);
120+ DO_ACTION("FolderViewPopup/CheckNewMessages", folderview_check_new(item->folder));
121+ DO_ACTION("FolderViewPopup/CheckNewFolders", folderview_rescan_tree(item->folder, FALSE));
122+ DO_ACTION("FolderViewPopup/RebuildTree", folderview_rescan_tree(item->folder, FALSE));
123 }
124
125-static void add_mailbox(gpointer callback_data, guint callback_action,
126- GtkWidget *widget)
127+static void add_mailbox(gpointer callback_data, guint callback_action, gpointer data)
128 {
129 MainWindow *mainwin = (MainWindow *) callback_data;
130 gchar *path, *basename;
131@@ -193,10 +189,10 @@
132 return;
133 }
134
135-static void new_folder_cb(FolderView *folderview, guint action,
136- GtkWidget *widget)
137+static void new_folder_cb(GtkAction *action, gpointer data)
138 {
139- GtkCTree *ctree = GTK_CTREE(folderview->ctree);
140+ FolderView *folderview = (FolderView *)data;
141+ GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
142 FolderItem *item;
143 FolderItem *new_item;
144 gchar *new_folder;
145@@ -245,9 +241,10 @@
146 folder_write_list();
147 }
148
149-static void remove_mailbox_cb(FolderView *folderview, guint action, GtkWidget *widget)
150+static void remove_mailbox_cb(GtkAction *action, gpointer data)
151 {
152- GtkCTree *ctree = GTK_CTREE(folderview->ctree);
153+ FolderView *folderview = (FolderView *)data;
154+ GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
155 GtkCTreeNode *node;
156 FolderItem *item;
157 gchar *name;
158@@ -276,10 +273,10 @@
159 folder_destroy(item->folder);
160 }
161
162-static void delete_folder_cb(FolderView *folderview, guint action,
163- GtkWidget *widget)
164+static void delete_folder_cb(GtkAction *action, gpointer data)
165 {
166- GtkCTree *ctree = GTK_CTREE(folderview->ctree);
167+ FolderView *folderview = (FolderView *)data;
168+ GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
169 FolderItem *item;
170 gchar *message, *name;
171 AlertValue avalue;
172@@ -329,24 +326,41 @@
173
174 }
175
176-static void move_folder_cb(FolderView *folderview, guint action, GtkWidget *widget)
177+static void move_folder_cb(GtkAction *action, gpointer data)
178+{
179+ FolderView *folderview = (FolderView *)data;
180+ FolderItem *from_folder = NULL, *to_folder = NULL;
181+
182+ from_folder = folderview_get_selected_item(folderview);
183+ if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
184+ return;
185+
186+ to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE);
187+ if (!to_folder)
188+ return;
189+
190+ folderview_move_folder(folderview, from_folder, to_folder, 0);
191+}
192+
193+static void copy_folder_cb(GtkAction *action, gpointer data)
194 {
195+ FolderView *folderview = (FolderView *)data;
196 FolderItem *from_folder = NULL, *to_folder = NULL;
197
198 from_folder = folderview_get_selected_item(folderview);
199 if (!from_folder || from_folder->folder->klass != claws_mailmbox_get_class())
200 return;
201
202- to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL);
203+ to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL, TRUE);
204 if (!to_folder)
205 return;
206
207- folderview_move_folder(folderview, from_folder, to_folder, action);
208+ folderview_move_folder(folderview, from_folder, to_folder, 1);
209 }
210
211-static void rename_folder_cb(FolderView *folderview, guint action,
212- GtkWidget *widget)
213+static void rename_folder_cb(GtkAction *action, gpointer data)
214 {
215+ FolderView *folderview = (FolderView *)data;
216 FolderItem *item, *parent;
217 gchar *new_folder;
218 gchar *name;
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.15.bb
index 119892f9e3..be7fd76439 100644
--- a/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.14.bb
+++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-mailmbox_1.15.bb
@@ -4,12 +4,10 @@ DEPENDS = "claws-mail"
4LICENSE = "GPLv3" 4LICENSE = "GPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6 6
7PR = "r1"
8
9SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz\ 7SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz\
10 file://claws-plugin-mailmbox-fixup.patch" 8 "
11SRC_URI[md5sum] = "0a5907628c1112cf8e5fe251ed1db551" 9SRC_URI[md5sum] = "7f72c68e6e1a8768f1247f455fd20b62"
12SRC_URI[sha256sum] = "d8d948807b4a09eb6da392161564c4bcee01070c9c86483889f93f1b14fd0870" 10SRC_URI[sha256sum] = "633f7835261c88a0aa06de38553ac935a1799a7128120963a7fa87ace01dac18"
13 11
14inherit autotools pkgconfig 12inherit autotools pkgconfig
15 13
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-02-05 16:52:04 +0000