Cairo-Dock Plug-ins

Merge lp://staging/~chris-chapuis/cairo-dock-plug-ins/mail into lp://staging/~cairo-dock-team/cairo-dock-plug-ins/plug-ins

  1. mail
  2. Merge into plug-ins
Proposed by Tofe
Status: Merged
Approved by: Tofe
Approved revision: no longer in the revision history of the source branch.
Merge reported by: Tofe
Merged at revision: not available
Proposed branch: lp://staging/~chris-chapuis/cairo-dock-plug-ins/mail
Merge into: lp://staging/~cairo-dock-team/cairo-dock-plug-ins/plug-ins
Diff against target: 86 lines
2 files modified
mail/src/cd-mail-applet-config.c (+12/-0)
mail/src/cd-mail-applet-notifications.c (+22/-14)
To merge this branch: bzr merge lp://staging/~chris-chapuis/cairo-dock-plug-ins/mail
Reviewer Review Type Date Requested Status
Tofe (community) Approve
Review via email: mp+13824@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Tofe (chris-chapuis) wrote :

Fixes for Mail

Revision history for this message
Tofe (chris-chapuis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mail/src/cd-mail-applet-config.c'
2--- mail/src/cd-mail-applet-config.c 2009-10-14 21:03:26 +0000
3+++ mail/src/cd-mail-applet-config.c 2009-10-23 07:20:27 +0000
4@@ -53,6 +53,18 @@
5 static void _get_mail_accounts (GKeyFile *pKeyFile, CairoDockModuleInstance *myApplet)
6 {
7 //\_______________ On remet a zero les comptes mail.
8+ if( myData.pMailAccounts )
9+ {
10+ guint i;
11+ for (i = 0; i < myData.pMailAccounts->len; i++)
12+ {
13+ CDMailAccount *pMailAccount;
14+ pMailAccount = g_ptr_array_index (myData.pMailAccounts, i);
15+
16+ if( pMailAccount != NULL && pMailAccount->pAccountMailTimer != NULL )
17+ cairo_dock_stop_task (pMailAccount->pAccountMailTimer);
18+ }
19+ }
20 cd_mail_free_all_accounts (myApplet);
21
22 myData.iPrevNbUnreadMails = 0;
23
24=== modified file 'mail/src/cd-mail-applet-notifications.c'
25--- mail/src/cd-mail-applet-notifications.c 2009-09-13 19:38:57 +0000
26+++ mail/src/cd-mail-applet-notifications.c 2009-10-23 07:20:27 +0000
27@@ -54,6 +54,26 @@
28 CD_APPLET_ON_CLICK_END
29
30
31+
32+static void _cd_mail_update_account (GtkMenuItem *menu_item, CDMailAccount *pMailAccount)
33+{
34+ if( pMailAccount )
35+ {
36+ if (cairo_dock_task_is_running (pMailAccount->pAccountMailTimer))
37+ {
38+ g_print ("account is being checked, wait a second\n");
39+ return;
40+ }
41+
42+ CairoDockModuleInstance *myApplet = pMailAccount->pAppletInstance;
43+ Icon *pIcon = (pMailAccount->icon ? pMailAccount->icon : myIcon);
44+ CairoContainer *pContainer = (pMailAccount->icon ? CD_APPLET_MY_ICONS_LIST_CONTAINER : myContainer);
45+ cairo_dock_set_quick_info (myDrawContext, "...", pIcon, cairo_dock_get_max_scale (pContainer));
46+
47+ cairo_dock_launch_task(pMailAccount->pAccountMailTimer);
48+ }
49+}
50+
51 static void _cd_mail_force_update(CairoDockModuleInstance *myApplet)
52 {
53 guint i;
54@@ -64,30 +84,18 @@
55 CDMailAccount *pMailAccount = g_ptr_array_index (myData.pMailAccounts, i);
56 if( pMailAccount )
57 {
58- cairo_dock_launch_task(pMailAccount->pAccountMailTimer);
59+ _cd_mail_update_account(NULL, pMailAccount);
60 }
61 }
62 }
63 }
64+
65 CD_APPLET_ON_MIDDLE_CLICK_BEGIN
66
67 _cd_mail_force_update(myApplet);
68
69 CD_APPLET_ON_MIDDLE_CLICK_END
70
71-
72-static void _cd_mail_update_account (GtkMenuItem *menu_item, CDMailAccount *pMailAccount)
73-{
74- if( pMailAccount )
75- {
76- CairoDockModuleInstance *myApplet = pMailAccount->pAppletInstance;
77- Icon *pIcon = (pMailAccount->icon ? pMailAccount->icon : myIcon);
78- CairoContainer *pContainer = (pMailAccount->icon ? CD_APPLET_MY_ICONS_LIST_CONTAINER : myContainer);
79- cairo_dock_set_quick_info (myDrawContext, "...", pIcon, cairo_dock_get_max_scale (pContainer));
80-
81- cairo_dock_launch_task(pMailAccount->pAccountMailTimer);
82- }
83-}
84 static void _cd_mail_launch_mail_appli (GtkMenuItem *menu_item, CairoDockModuleInstance *myApplet)
85 {
86 cairo_dock_launch_command (myConfig.cMailApplication);

Subscribers

People subscribed via source and target branches