← Back to branch summary

~cairo-dock-team/ubuntu/quantal/cairo-dock-plug-ins/3.1.0

« back to all changes in this revision

Viewing changes to Indicator-applet/indicator-applet.h

  • Committer: Package Import Robot
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2012-02-16 01:45:57 UTC
  • mfrom: (1.1.18)
  • Revision ID: package-import@ubuntu.com-20120216014557-iah0bv0lfwth6sxx
Tags: 3.0.0.0beta1-0ubuntu1
https://launchpad.net/bugs/932042
* New upstream release. (LP: #932042)
* Upstream (short) ChangeLog:
 - The Log out applet has been rewritten, now allows one to switch users.
 - Many shortkeys have been added in different applets
 - The Sound Menu from Ubuntu has been integrated into the
    Sound-Control applet.
 - The Sound Menu from Ubuntu has been integrated into the
    Sound-Control applet.
 - Cairo-Dock now uses GTK3, for a better integration in a Gnome desktop
 - Few additions to the DBus API.
 - (...)
* debian/patches:
 - Removed all previous patches (now in upstream)
* debian/rules and debian/control:
 - Added multiarch support
* debian/control:
 - Updated build-depends list (needed for MultiArch support and GTK3)
 - libgtkglext1-dev is no longer needed
    (replaced by libgl, libglu and libpango)
 - Removed old Gnome dependences: libgnomevfs2-dev, libgnomeui-dev
    and libgnome-keyring-dev
 - libfftw3-dev is no longer needed
 - Increased the version of Cairo-Dock packages
 - Separated DBus interfaces from cairo-dock-plug-ins package into
    cairo-dock-plug-ins-dbus-interface-* packages in order to add right
    dependences.
 - cairo-dock-plug-ins: cairo-dock-plug-ins-dbus-interface-python
    has been added.
* debian/rules:
 - Added -Denable-global-menu=yes (supported in Ubuntu)
* debian/cairo-dock-plug-ins.install
   and debian/cairo-dock-plug-ins-integration.install: MultiArch is
   now supported
* debian/cairo-dock-plug-ins.install,
   debian/cairo-dock-plug-ins-data.install,
   debian/cairo-dock-plug-ins-dbus-interface-vala.install,
   debian/cairo-dock-plug-ins-dbus-interface-ruby.install,
   debian/cairo-dock-plug-ins-dbus-interface-python.install and
   debian/cairo-dock-plug-ins-dbus-interface-mono.install:
    DBus interfaces from cairo-dock-plug-ins have been separated into
    cairo-dock-plug-ins-dbus-interface-* pacakges
* Updated debian/watch
* debian/compat
 - Debhelper 8 is now used

Show diffs side-by-side

added added

removed removed

Lines of Context:
Indicator-applet/indicator-applet.h
24
24
#include <cairo-dock.h>
25
25
 
26
26
#include <libindicator/indicator.h>
27
 
#include <libindicator/indicator-object.h>
 
27
///#include <libindicator/indicator-object.h>
28
28
#include <libindicator/indicator-service-manager.h>
29
29
 
 
30
#if (GTK_MAJOR_VERSION < 3) || defined (DBUSMENU_GTK3_NEW)
30
31
#include <libdbusmenu-gtk/menuitem.h>
31
32
#include <libdbusmenu-gtk/menu.h>
 
33
#else
 
34
#include <libdbusmenu-gtk3/menuitem.h>
 
35
#include <libdbusmenu-gtk3/menu.h>
 
36
#endif
32
37
 
33
38
typedef struct _CDAppletIndicator CDAppletIndicator;
34
39
 
37
42
        DBusGProxy * pServiceProxy;
38
43
        DbusmenuGtkMenu *pMenu;
39
44
        guint iSidGetMenuOnce;
 
45
        guint iSidCheckIndicator;
40
46
        gchar *cStatusIcon;
41
47
        gboolean bConnected;
42
48
        const gchar *cBusName;
50
56
        void (*add_menu_handler) (DbusmenuGtkClient * client);
51
57
        };
52
58
 
53
 
 
54
 
 
55
 
CDAppletIndicator *cd_indicator_new (CairoDockModuleInstance *pApplet, const gchar *cBusName, const gchar *cObjectName, const gchar *cServiceInterface, const gchar *cMenuObject);
 
59
#define INDICATOR_APPLET_DEFAULT_VERSION 1
 
60
 
 
61
 
 
62
CDAppletIndicator *cd_indicator_new (CairoDockModuleInstance *pApplet, const gchar *cBusName, const gchar *cObjectName, const gchar *cServiceInterface, const gchar *cMenuObject, int iVersion);
56
63
 
57
64
void cd_indicator_destroy (CDAppletIndicator *pIndicator);
58
65
 
62
69
 
63
70
gboolean cd_indicator_show_menu (CDAppletIndicator *pIndicator);
64
71
 
 
72
#define cd_indicator_is_connected(pIndicator) (pIndicator)->bConnected
65
73
 
66
74
#endif