diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 34 | ||||
| -rw-r--r-- | src/indicator-messages.c | 4 | ||||
| -rw-r--r-- | src/launcher-menu-item.c | 13 |
4 files changed, 9 insertions, 44 deletions
diff --git a/configure.ac b/configure.ac index d9962a0..ef2239b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-messages.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.2.0dev) +AM_INIT_AUTOMAKE(indicator-messages, 0.2.0) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index c2e95e7..0d063a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,38 +1,10 @@ -indicator-messages (0.2.0~bzr126-0ubuntu1~ppa3~menuupdate2) karmic; urgency=low +indicator-messages (0.2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low - * Style baby! - - -- Ted Gould <ted@ubuntu.com> Wed, 26 Aug 2009 20:48:09 -0500 - -indicator-messages (0.2.0~bzr126-0ubuntu1~ppa3~menuupdate1) karmic; urgency=low - - * Merging in changes that are made possible via an update - to the dbusmenu libraries. + * Upstream version 0.2.0 * debian/control: Adding dependency information for libdbusmenu to say >= 0.0.2 to match upstream build system. - -- Ted Gould <ted@ubuntu.com> Wed, 26 Aug 2009 20:33:11 -0500 - -indicator-messages (0.2.0~bzr126-0ubuntu1~ppa2) karmic; urgency=low - - * Merging in branch to make it so that the 'green dot' works - again and that the icon will hide with no entries. - - -- Ted Gould <ted@ubuntu.com> Wed, 26 Aug 2009 13:57:56 -0500 - -indicator-messages (0.2.0~bzr126-0ubuntu1~ppa1) karmic; urgency=low - - * Merging in upstream version with launchers, blacklists and - directory watches. - - -- Ted Gould <ted@ubuntu.com> Tue, 25 Aug 2009 16:09:35 -0500 - -indicator-messages (0.2.0~bzr121-0ubuntu3~ppa1) karmic; urgency=low - - * Fix to dereference the application menu items correctly so that - the signal handlers are dropped as well. - - -- Ted Gould <ted@ubuntu.com> Wed, 05 Aug 2009 19:00:31 +0100 + -- Ted Gould <ted@ubuntu.com> Thu, 27 Aug 2009 10:24:02 -0500 indicator-messages (0.2.0~bzr121-0ubuntu2) karmic; urgency=low diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 0a1002d..c410ef7 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -140,6 +140,10 @@ setup_icon_proxy (gpointer userdata) static gboolean new_launcher_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE); + g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE); + /* Note: not checking parent, it's reasonable for it to be NULL */ + GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new()); GtkWidget * vbox = gtk_vbox_new(TRUE, 2); diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index 6678cc5..822196b 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -160,23 +160,12 @@ activate_cb (LauncherMenuItem * self, gpointer data) LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self); g_return_if_fail(priv->appinfo != NULL); - /* This should manage the X stuff for us */ - GdkAppLaunchContext * context = gdk_app_launch_context_new(); - - /* Using the current time as we don't have the event - time as that's not sent across the bus */ - GTimeVal time; - g_get_current_time(&time); - gdk_app_launch_context_set_timestamp(context, time.tv_usec / 1000); - GError * error = NULL; - if (!g_app_info_launch(priv->appinfo, NULL, G_APP_LAUNCH_CONTEXT(context), &error)) { + if (!g_app_info_launch(priv->appinfo, NULL, NULL, &error)) { g_warning("Application failed to launch '%s' because: %s", launcher_menu_item_get_name(self), error->message); g_error_free(error); } - g_object_unref(G_OBJECT(context)); - return; } |