diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-14 10:36:48 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-14 10:36:48 -0600 |
| commit | 2461e539704dc3b306c24b5b841be342111a76b9 (patch) | |
| tree | 36293d9dbbf964f7f1fe54765140c19564c861b1 /libdbusmenu-glib | |
| parent | b76ed9c7f918123610e5e56bb9cdd1025d34caa1 (diff) | |
| parent | ece305e4b1b4eee4e3fb54faf8f9c291ef915e8c (diff) | |
| download | libdbusmenu-2461e539704dc3b306c24b5b841be342111a76b9.tar.gz libdbusmenu-2461e539704dc3b306c24b5b841be342111a76b9.tar.bz2 libdbusmenu-2461e539704dc3b306c24b5b841be342111a76b9.zip | |
Import upstream version 0.3.92
Diffstat (limited to 'libdbusmenu-glib')
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 4 | ||||
| -rw-r--r-- | libdbusmenu-glib/Makefile.in | 4 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 4a65ac0..a1247a3 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -56,10 +56,10 @@ pkgconfig_DATA = dbusmenu-glib-0.4.pc pkgconfigdir = $(libdir)/pkgconfig %.xml.h: %.xml - echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ + echo "extern const char * $(subst -,_,$(subst .,_,$(basename $(notdir $@))));" > $@ %.xml.c: %.xml - echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ + echo "const char * $(subst -,_,$(subst .,_,$(basename $(notdir $@)))) = " > $@ sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ echo ";" >> $@ diff --git a/libdbusmenu-glib/Makefile.in b/libdbusmenu-glib/Makefile.in index 1d15f32..f4f3819 100644 --- a/libdbusmenu-glib/Makefile.in +++ b/libdbusmenu-glib/Makefile.in @@ -904,10 +904,10 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ %.xml.h: %.xml - echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ + echo "extern const char * $(subst -,_,$(subst .,_,$(basename $(notdir $@))));" > $@ %.xml.c: %.xml - echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ + echo "const char * $(subst -,_,$(subst .,_,$(basename $(notdir $@)))) = " > $@ sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ echo ";" >> $@ diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 373cc05..100eb14 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -1047,6 +1047,12 @@ bus_event (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * i event_data->timestamp = g_variant_get_uint32(g_variant_get_child_value(params, 3)); event_data->variant = g_variant_get_child_value(params, 2); + if (g_variant_is_of_type(event_data->variant, G_VARIANT_TYPE_VARIANT)) { + event_data->variant = g_variant_get_variant(event_data->variant); + } + + g_variant_ref(event_data->variant); + g_timeout_add(0, event_local_handler, event_data); g_dbus_method_invocation_return_value(invocation, NULL); |