From 409e654b54e19d0e50d200a706487d141c5cf89f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 10:48:06 -0500 Subject: Bumping Dbusmenu version to 0.0.2 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac90330..c1fc1ec 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) GTK_REQUIRED_VERSION=2.12 INDICATOR_REQUIRED_VERSION=0.2.0 -DBUSMENUGTK_REQUIRED_VERSION=0.0.0 +DBUSMENUGTK_REQUIRED_VERSION=0.0.2 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION -- cgit v1.2.3 From 1765940759064c0d7cd8428a3c89fa862f24f076 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 12:52:30 -0500 Subject: Instead of populating the menu on added, populate it on realization. --- src/indicator-session.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index 07efc86..43c568f 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -61,6 +61,7 @@ static void child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, gu static guint status_menu_pos_offset (void); static guint users_menu_pos_offset (void); static guint session_menu_pos_offset (void); +static void child_realized (DbusmenuMenuitem * child, gpointer userdata); GtkLabel * get_label (void) @@ -79,14 +80,44 @@ get_icon (void) return status_image; } +typedef struct _realized_data_t realized_data_t; +struct _realized_data_t { + guint position; + section_t section; +}; + static void child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint position, gpointer section) { + realized_data_t * data = g_new0(realized_data_t, 1); + if (data == NULL) { + g_warning("Unable to allocate data for realization of item"); + return; + } + + data->position = position; + data->section = GPOINTER_TO_UINT(section); + + g_signal_connect(G_OBJECT(child), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(child_realized), data); + return; +} + +static void +child_realized (DbusmenuMenuitem * child, gpointer userdata) +{ + g_return_if_fail(userdata != NULL); + g_return_if_fail(DBUSMENU_IS_MENUITEM(child)); + + realized_data_t * data = (realized_data_t *)userdata; + guint position = data->position; + section_t section = data->section; + g_free(data); + DbusmenuGtkClient * client = NULL; gchar * errorstr = NULL; guint (*posfunc) (void) = NULL; - switch (GPOINTER_TO_UINT(section)) { + switch (section) { case STATUS_SECTION: client = status_client; errorstr = "Status"; -- cgit v1.2.3 From 72b6ee81d0399eff293bc5d37326c778550b849e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 12:53:53 -0500 Subject: debian/control: Looking for libdbusmenu* >= 0.0.2 --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e559176..59c47c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu1) UNRELEASED; urgency=low * Merge from upstream + * debian/control: Looking for libdbusmenu* >= 0.0.2 -- Ted Gould Thu, 27 Aug 2009 12:52:54 -0500 diff --git a/debian/control b/debian/control index 19c4318..21d1deb 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 5.0), gnome-doc-utils, scrollkeeper, libindicator-dev, - libdbusmenu-glib-dev, - libdbusmenu-gtk-dev, + libdbusmenu-glib-dev (>= 0.0.2), + libdbusmenu-gtk-dev (>= 0.0.2), libpolkit-gnome-dev, intltool Standards-Version: 3.8.2 -- cgit v1.2.3 From cc8a87dfca40afd26ab6989db11dd63ea2eccf5c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 13:33:41 -0500 Subject: Updating to dbusmenu version 0.1.0 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c1fc1ec..28b2c8b 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) GTK_REQUIRED_VERSION=2.12 INDICATOR_REQUIRED_VERSION=0.2.0 -DBUSMENUGTK_REQUIRED_VERSION=0.0.2 +DBUSMENUGTK_REQUIRED_VERSION=0.1.0 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION -- cgit v1.2.3 From 579294b93ce32a8324c54b721c08f9076bc44875 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 13:34:28 -0500 Subject: releasing version 0.1~bzr18-0ubuntu1~ppa3~dbusmenu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59c47c8..284edf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu1) UNRELEASED; urgency=low +indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu1) karmic; urgency=low * Merge from upstream * debian/control: Looking for libdbusmenu* >= 0.0.2 - -- Ted Gould Thu, 27 Aug 2009 12:52:54 -0500 + -- Ted Gould Thu, 27 Aug 2009 13:34:24 -0500 indicator-session (0.1~bzr18-0ubuntu1~ppa2) karmic; urgency=low -- cgit v1.2.3 From f9bee4d6cffd7a0b89a323d4c89093ac38be5c88 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 13:34:42 -0500 Subject: Merge from upstream --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 284edf3..7900d9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu1ubuntu1) UNRELEASED; urgency=low + + * Merge from upstream + + -- Ted Gould Thu, 27 Aug 2009 13:34:31 -0500 + indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu1) karmic; urgency=low * Merge from upstream -- cgit v1.2.3 From e8eb773ac18e313284aa1f9eed009c7efac1aec8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 13:35:17 -0500 Subject: debian/control: Looking for libdbusmenu* >= 0.1.0 --- debian/changelog | 5 +++-- debian/control | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7900d9f..5c84f9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu1ubuntu1) UNRELEASED; urgency=low +indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu2) UNRELEASED; urgency=low * Merge from upstream + * debian/control: Looking for libdbusmenu* >= 0.1.0 - -- Ted Gould Thu, 27 Aug 2009 13:34:31 -0500 + -- Ted Gould Thu, 27 Aug 2009 13:34:56 -0500 indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu1) karmic; urgency=low diff --git a/debian/control b/debian/control index 21d1deb..b9ad314 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 5.0), gnome-doc-utils, scrollkeeper, libindicator-dev, - libdbusmenu-glib-dev (>= 0.0.2), - libdbusmenu-gtk-dev (>= 0.0.2), + libdbusmenu-glib-dev (>= 0.1.0), + libdbusmenu-gtk-dev (>= 0.1.0), libpolkit-gnome-dev, intltool Standards-Version: 3.8.2 -- cgit v1.2.3 From 8756b43167d6ec1bcef4ff587038298c45ae34d0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Aug 2009 13:37:15 -0500 Subject: releasing version 0.1~bzr18-0ubuntu1~ppa3~dbusmenu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c84f9a..2896aba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu2) UNRELEASED; urgency=low +indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu2) karmic; urgency=low * Merge from upstream * debian/control: Looking for libdbusmenu* >= 0.1.0 - -- Ted Gould Thu, 27 Aug 2009 13:34:56 -0500 + -- Ted Gould Thu, 27 Aug 2009 13:37:10 -0500 indicator-session (0.1~bzr18-0ubuntu1~ppa3~dbusmenu1) karmic; urgency=low -- cgit v1.2.3