← Back to branch summary

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

« back to all changes in this revision

Viewing changes to systray/src/systray-interface.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:
systray/src/systray-interface.c
33
33
 
34
34
void cd_systray_build_dialog (void)
35
35
{
36
 
        CairoDialogAttribute attr;
37
 
        memset (&attr, 0, sizeof (CairoDialogAttribute));
 
36
        CairoDialogAttr attr;
 
37
        memset (&attr, 0, sizeof (CairoDialogAttr));
38
38
        attr.pInteractiveWidget = GTK_WIDGET (myData.tray);
39
39
        attr.bHideOnClick = TRUE;  // keep the dialog alive on click (hide it).
40
 
        myData.dialog = cairo_dock_build_dialog (&attr, myIcon, myContainer);
 
40
        attr.pIcon = myIcon;
 
41
        attr.pContainer = myContainer;
 
42
        myData.dialog = gldi_dialog_new (&attr);
41
43
        gtk_window_set_resizable (GTK_WINDOW(myData.dialog->container.pWidget), FALSE);  /// utile ?...
42
 
        cairo_dock_hide_dialog (myData.dialog);
 
44
        gldi_dialog_hide (myData.dialog);
43
45
}
44
46
 
45
47
void cd_systray_build_systray (void)
58
60
        }
59
61
        else
60
62
        {
61
 
                cairo_dock_add_interactive_widget_to_desklet (GTK_WIDGET (myData.tray), myDesklet);
 
63
                gldi_desklet_add_interactive_widget (myDesklet, GTK_WIDGET (myData.tray));
62
64
                CD_APPLET_SET_DESKLET_RENDERER (NULL);
63
65
        }
64
66
        gtk_widget_show (GTK_WIDGET (myData.tray));
69
71
{
70
72
        if (na_tray_manager_check_running (gtk_widget_get_screen (GTK_WIDGET (myContainer->pWidget))) && ! cairo_dock_is_loading ())
71
73
        {
72
 
                cairo_dock_show_temporary_dialog_with_icon (D_("Another systray is already running (probably on your panel)\nSince there can only be one systray at once, you should remove it to avoid any conflict."), myIcon, myContainer, 8000, NULL);
 
74
                gldi_dialog_show_temporary_with_icon (D_("Another systray is already running (probably on your panel)\nSince there can only be one systray at once, you should remove it to avoid any conflict."), myIcon, myContainer, 8000, NULL);
73
75
        }
74
76
}
75
77
 
79
81
        if (myData.tray)
80
82
        {
81
83
                if (myDesklet)
82
 
                        cairo_dock_show_desklet(myDesklet);
 
84
                        gldi_desklet_show(myDesklet);
83
85
                else if (myData.dialog)
84
 
                        cairo_dock_unhide_dialog(myData.dialog);
 
86
                        gldi_dialog_unhide (myData.dialog);
85
87
        }
86
88
}
87
89