← Back to branch summary

~ubuntu-branches/ubuntu/vivid/cairo-dock-plug-ins/vivid

« back to all changes in this revision

Viewing changes to clock/src/applet-notifications.c

  • Committer: Matthieu Baerts
  • Date: 2013-08-27 14:46:47 UTC
  • mto: (53.1.4 cairo-dock-plug-ins)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: matttbe@gmail.com-20130827144647-wm0kyawa8vcg0cso
Tags: upstream-3.2.99.beta1.1~20130827~bzr2928
Import upstream version 3.2.99.beta1.1~20130827~bzr2928

Show diffs side-by-side

added added

removed removed

Lines of Context:
clock/src/applet-notifications.c
28
28
#include "applet-notifications.h"
29
29
 
30
30
 
31
 
static void _cd_clock_launch_time_admin (GtkMenuItem *menu_item, CairoDockModuleInstance *myApplet)
 
31
static void _cd_clock_launch_time_admin (GtkMenuItem *menu_item, GldiModuleInstance *myApplet)
32
32
{
33
33
        if (myConfig.cSetupTimeCommand != NULL)
34
34
        {
55
55
        cd_clock_show_hide_calendar (myApplet);
56
56
CD_APPLET_ON_CLICK_END
57
57
 
58
 
static void _cd_clock_show_tasks_today (GtkMenuItem *menu_item, CairoDockModuleInstance *myApplet)
 
58
static void _cd_clock_show_tasks_today (GtkMenuItem *menu_item, GldiModuleInstance *myApplet)
59
59
{
60
60
        gchar *cTasks = cd_clock_get_tasks_for_today (myApplet);
61
61
        if (cTasks == NULL)
63
63
        
64
64
        cd_clock_hide_dialogs (myApplet);
65
65
        
66
 
        CairoDialogAttribute attr;
67
 
        memset (&attr, 0, sizeof (CairoDialogAttribute));
 
66
        CairoDialogAttr attr;
 
67
        memset (&attr, 0, sizeof (CairoDialogAttr));
68
68
        attr.cText = cTasks;
69
69
        attr.cImageFilePath = MY_APPLET_SHARE_DATA_DIR"/icon-task.png";
70
70
        attr.iTimeLength = 30e3;
71
71
        attr.bUseMarkup = TRUE;
72
 
        cairo_dock_build_dialog (&attr, myIcon, myContainer);
 
72
        attr.pIcon = myIcon;
 
73
        attr.pContainer = myContainer;
 
74
        gldi_dialog_new (&attr);
73
75
        
74
76
        g_free (cTasks);
75
77
}
76
 
static void _cd_clock_show_tasks_week (GtkMenuItem *menu_item, CairoDockModuleInstance *myApplet)
 
78
static void _cd_clock_show_tasks_week (GtkMenuItem *menu_item, GldiModuleInstance *myApplet)
77
79
{
78
80
        gchar *cTasks = cd_clock_get_tasks_for_this_week (myApplet);
79
81
        double fDelay = 30e3;
85
87
        
86
88
        cd_clock_hide_dialogs (myApplet);
87
89
        
88
 
        CairoDialogAttribute attr;
89
 
        memset (&attr, 0, sizeof (CairoDialogAttribute));
 
90
        CairoDialogAttr attr;
 
91
        memset (&attr, 0, sizeof (CairoDialogAttr));
90
92
        attr.cText = cTasks;
91
93
        attr.cImageFilePath = MY_APPLET_SHARE_DATA_DIR"/icon-task.png";
92
94
        attr.iTimeLength = fDelay;
93
95
        attr.bUseMarkup = TRUE;
94
 
        cairo_dock_build_dialog (&attr, myIcon, myContainer);
 
96
        attr.pIcon = myIcon;
 
97
        attr.pContainer = myContainer;
 
98
        gldi_dialog_new (&attr);
95
99
        
96
100
        g_free (cTasks);
97
101
}