diff options
| author | Ted Gould <ted@gould.cx> | 2011-04-25 15:10:47 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-04-25 15:10:47 -0500 |
| commit | ddd6e111fef609b37ab31198e3494c4b0873ee2e (patch) | |
| tree | b526b34090122d6e4486e20e45974bccddf31588 /libdbusmenu-glib | |
| parent | 347535df0acc9c81bfecf8db6190ca402cb42ded (diff) | |
| parent | 2b93a6778095ef3b928eea0e29a742db2eea4160 (diff) | |
| download | libdbusmenu-ddd6e111fef609b37ab31198e3494c4b0873ee2e.tar.gz libdbusmenu-ddd6e111fef609b37ab31198e3494c4b0873ee2e.tar.bz2 libdbusmenu-ddd6e111fef609b37ab31198e3494c4b0873ee2e.zip | |
Import upstream version 0.4.4
Diffstat (limited to 'libdbusmenu-glib')
| -rw-r--r-- | libdbusmenu-glib/Makefile.in | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in index 5c19fc4..e2b9157 100644 --- a/libdbusmenu-glib/Makefile.in +++ b/libdbusmenu-glib/Makefile.in @@ -61,7 +61,12 @@ DIST_COMMON = $(libdbusmenu_glibinclude_HEADERS) $(srcdir)/Makefile.am \ @HAVE_INTROSPECTION_TRUE@ $(vapi_DATA) subdir = libdbusmenu-glib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 2e6b09a..588c940 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -1239,7 +1239,7 @@ menuproxy_signal_cb (GDBusProxy * proxy, gchar * sender, gchar * signal, GVarian } else if (priv->root == NULL) { /* Drop out here, all the rest of these really need to have a root node so we can just ignore them if there isn't one. */ - } else if (g_strcmp0(signal, "ItemPropertiesUpdated") == 0) { + } else if (g_strcmp0(signal, "ItemsPropertiesUpdated") == 0) { /* Remove before adding just incase there is a duplicate, against the rules, but we can handle it so let's do it. */ GVariantIter ritems; diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index a41e6ce..be99421 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -455,6 +455,7 @@ set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec) g_return_if_fail(priv->bus_lookup != NULL); } + g_object_ref(obj); g_bus_get(G_BUS_TYPE_SESSION, priv->bus_lookup, bus_got_cb, obj); } else { register_object(DBUSMENU_SERVER(obj)); @@ -694,6 +695,7 @@ bus_got_cb (GObject * obj, GAsyncResult * result, gpointer user_data) if (error != NULL) { g_warning("Unable to get session bus: %s", error->message); g_error_free(error); + g_object_unref(G_OBJECT(user_data)); return; } @@ -706,6 +708,7 @@ bus_got_cb (GObject * obj, GAsyncResult * result, gpointer user_data) register_object(DBUSMENU_SERVER(user_data)); + g_object_unref(G_OBJECT(user_data)); return; } @@ -983,7 +986,7 @@ menuitem_property_idle (gpointer user_data) NULL, priv->dbusobject, DBUSMENU_INTERFACE, - "ItemPropertiesUpdated", + "ItemsPropertiesUpdated", g_variant_new_tuple(megadata, 2), NULL); } else { |