diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-12 13:08:18 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-12 13:08:18 -0500 |
| commit | c539a45070ac3d9f3036eaec40ee34025800cddc (patch) | |
| tree | 7f4c937d84e9a1b5a9ae70c45dfbdeed8efb223f /src | |
| parent | 1fa02756377589c14a80c0f96426f5b902bede03 (diff) | |
| parent | ada8fb9e0a3b41d1b21a3bf9b86d5be0f647051f (diff) | |
| download | ayatana-indicator-messages-c539a45070ac3d9f3036eaec40ee34025800cddc.tar.gz ayatana-indicator-messages-c539a45070ac3d9f3036eaec40ee34025800cddc.tar.bz2 ayatana-indicator-messages-c539a45070ac3d9f3036eaec40ee34025800cddc.zip | |
Import upstream version 0.3.9
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 7 | ||||
| -rw-r--r-- | src/im-menu-item.c | 2 | ||||
| -rw-r--r-- | src/messages-service-server.h | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 6e6cc22..d0cd1eb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -39,10 +39,7 @@ libexec_PROGRAMS = indicator-messages-service$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.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__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -212,6 +209,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff --git a/src/im-menu-item.c b/src/im-menu-item.c index 5841d81..b8b3709 100644 --- a/src/im-menu-item.c +++ b/src/im-menu-item.c @@ -348,7 +348,7 @@ count_cb (IndicateListener * listener, IndicateListenerServer * server, Indicate g_free(priv->count); } - priv->count = g_strdup_printf("(%s)", propertydata); + priv->count = g_strdup_printf("%s", propertydata); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), INDICATOR_MENUITEM_PROP_RIGHT, priv->count); return; diff --git a/src/messages-service-server.h b/src/messages-service-server.h index 51420b1..61921f9 100644 --- a/src/messages-service-server.h +++ b/src/messages-service-server.h @@ -27,7 +27,6 @@ G_BEGIN_DECLS #define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) #define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) #define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) #else /* !G_ENABLE_DEBUG */ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. * Do not access GValues directly in your code. Instead, use the @@ -51,7 +50,6 @@ G_BEGIN_DECLS #define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer #define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer #define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ |