diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-03-13 15:38:47 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-03-13 15:38:47 -0500 |
| commit | fed02bf9683b491b5db0196495377671594de98b (patch) | |
| tree | 2c0c0f68b4bf82d150bd4cd4c9e977ec5e4b9d4b /src | |
| parent | d518799d9aa5a6fc509398d25849831f9109d8d9 (diff) | |
| parent | 8e26e844c5f42d55257b6f8e52634314d134b4d8 (diff) | |
| download | ayatana-indicator-application-fed02bf9683b491b5db0196495377671594de98b.tar.gz ayatana-indicator-application-fed02bf9683b491b5db0196495377671594de98b.tar.bz2 ayatana-indicator-application-fed02bf9683b491b5db0196495377671594de98b.zip | |
Import upstream version 0.4.93
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 7 | ||||
| -rw-r--r-- | src/application-service-watcher.c | 8 | ||||
| -rw-r--r-- | src/generate-id.c | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 310a47c..e2fcae6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -56,8 +56,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ libexec_PROGRAMS = indicator-application-service$(EXEEXT) subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/m4/gcov.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(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)/acinclude.m4 $(top_srcdir)/m4/gcov.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c index 50b0be9..1c12eee 100644 --- a/src/application-service-watcher.c +++ b/src/application-service-watcher.c @@ -249,9 +249,11 @@ _notification_watcher_server_register_status_notifier_item (ApplicationServiceWa ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher); if (service[0] == '/') { + char * sender = dbus_g_method_get_sender(method); application_service_appstore_application_add(priv->appstore, - dbus_g_method_get_sender(method), + sender, service); + g_free(sender); } else { application_service_appstore_application_add(priv->appstore, service, @@ -293,9 +295,11 @@ _notification_watcher_server_x_ayatana_register_notification_approver (Applicati { ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher); + char * sender = dbus_g_method_get_sender(method); application_service_appstore_approver_add(priv->appstore, - dbus_g_method_get_sender(method), + sender, path); + g_free(sender); dbus_g_method_return(method, G_TYPE_NONE); return TRUE; diff --git a/src/generate-id.c b/src/generate-id.c index 14d762e..9515860 100644 --- a/src/generate-id.c +++ b/src/generate-id.c @@ -26,10 +26,10 @@ with this program. If not, see <http://www.gnu.org/licenses/>. guint32 generate_id (const AppIndicatorCategory catenum, const gchar * id) { - guchar category = 0; - guchar first = 0; - guchar second = 0; - guchar third = 0; + guint32 category = 0; + guint32 first = 0; + guint32 second = 0; + guint32 third = 0; switch (catenum) { case APP_INDICATOR_CATEGORY_OTHER: |