From 087e6316977fbd3f870ce6d7b734de9765f6eed2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 12 Jan 2011 09:01:09 -0600 Subject: Fix the pkgconfig name for dbusmenu-glib-0.4 --- src/appindicator-0.1.pc.in | 2 +- src/appindicator3-0.1.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/appindicator-0.1.pc.in b/src/appindicator-0.1.pc.in index b80fded..d885fd3 100644 --- a/src/appindicator-0.1.pc.in +++ b/src/appindicator-0.1.pc.in @@ -5,7 +5,7 @@ bindir=@bindir@ includedir=@includedir@ Cflags: -I${includedir}/libappindicator-0.1 -Requires: dbusmenu-glib gtk+-2.0 +Requires: dbusmenu-glib-0.4 gtk+-2.0 Libs: -L${libdir} -lappindicator Name: appindicator-0.1 diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in index a485910..f59ac70 100644 --- a/src/appindicator3-0.1.pc.in +++ b/src/appindicator3-0.1.pc.in @@ -5,7 +5,7 @@ bindir=@bindir@ includedir=@includedir@ Cflags: -I${includedir}/libappindicator3-0.1 -Requires: dbusmenu-glib gtk+-3.0 +Requires: dbusmenu-glib-0.4 gtk+-3.0 Libs: -L${libdir} -lappindicator3 Name: appindicator3-0.1 -- cgit v1.2.3 From b38d1d8a853bee2d08ce7ead3f0ffa00a6670cd6 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 13 Jan 2011 17:36:29 -0600 Subject: use notdir in case make gives us full paths --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index a5ea29b..069247f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,11 +101,11 @@ DBUS_SPECS = \ gen-%.xml.h: %.xml @echo "Building $@ from $<" - @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@ + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@ gen-%.xml.c: %.xml @echo "Building $@ from $<" - @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@ + @echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@ @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ @echo ";" >> $@ -- cgit v1.2.3 From 05980b6e31ad1c48e93fb8733a89815d244ba933 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 13 Jan 2011 17:36:57 -0600 Subject: avoid nulls when crafting variants --- src/app-indicator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/app-indicator.c b/src/app-indicator.c index babdaf5..d7e040c 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -921,9 +921,9 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * } else if (g_strcmp0(property, "IconName") == 0) { return g_variant_new_string(priv->icon_name); } else if (g_strcmp0(property, "AttentionIconName") == 0) { - return g_variant_new_string(priv->attention_icon_name); + return g_variant_new_string(priv->attention_icon_name ? priv->attention_icon_name : ""); } else if (g_strcmp0(property, "IconThemePath") == 0) { - return g_variant_new_string(priv->icon_theme_path); + return g_variant_new_string(priv->icon_theme_path ? priv->icon_theme_path : ""); } else if (g_strcmp0(property, "Menu") == 0) { if (priv->menuservice != NULL) { GValue strval = { 0 }; @@ -936,9 +936,9 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * return g_variant_new("o", "/"); } } else if (g_strcmp0(property, "XAyatanaLabel") == 0) { - return g_variant_new_string(priv->label); + return g_variant_new_string(priv->label ? priv->label : ""); } else if (g_strcmp0(property, "XAyatanaLabelGuide") == 0) { - return g_variant_new_string(priv->label_guide); + return g_variant_new_string(priv->label_guide ? priv->label_guide : ""); } else if (g_strcmp0(property, "XAyatanaOrderingIndex") == 0) { return g_variant_new_uint32(priv->ordering_index); } -- cgit v1.2.3 From 0e9f42a12daf9bc3f14f6dd7dcc7efb33a22fa94 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 13 Jan 2011 17:48:53 -0600 Subject: aw shucks, do the required properties too, defensively --- src/app-indicator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/app-indicator.c b/src/app-indicator.c index d7e040c..40959bf 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -909,17 +909,17 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * AppIndicatorPrivate *priv = app->priv; if (g_strcmp0(property, "Id") == 0) { - return g_variant_new_string(app->priv->id); + return g_variant_new_string(app->priv->id ? app->priv->id : ""); } else if (g_strcmp0(property, "Category") == 0) { GEnumValue *enum_value; enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY), priv->category); - return g_variant_new_string(enum_value->value_nick); + return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : ""); } else if (g_strcmp0(property, "Status") == 0) { GEnumValue *enum_value; enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), priv->status); - return g_variant_new_string(enum_value->value_nick); + return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : ""); } else if (g_strcmp0(property, "IconName") == 0) { - return g_variant_new_string(priv->icon_name); + return g_variant_new_string(priv->icon_name ? priv->icon_name : ""); } else if (g_strcmp0(property, "AttentionIconName") == 0) { return g_variant_new_string(priv->attention_icon_name ? priv->attention_icon_name : ""); } else if (g_strcmp0(property, "IconThemePath") == 0) { -- cgit v1.2.3 From cf693f9f227c8d01d538ef366ba787c55fd6e26c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 13 Jan 2011 20:05:12 -0600 Subject: Canonical.com conversion --- src/dbus-shared.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/dbus-shared.h b/src/dbus-shared.h index 1d8d89c..71c063e 100644 --- a/src/dbus-shared.h +++ b/src/dbus-shared.h @@ -20,9 +20,9 @@ with this program. If not, see . */ -#define INDICATOR_APPLICATION_DBUS_ADDR "org.ayatana.indicator.application" -#define INDICATOR_APPLICATION_DBUS_OBJ "/org/ayatana/indicator/application/service" -#define INDICATOR_APPLICATION_DBUS_IFACE "org.ayatana.indicator.application.service" +#define INDICATOR_APPLICATION_DBUS_ADDR "com.canonical.indicator.application" +#define INDICATOR_APPLICATION_DBUS_OBJ "/com/canonical/indicator/application/service" +#define INDICATOR_APPLICATION_DBUS_IFACE "com.canonical.indicator.application.service" #define NOTIFICATION_WATCHER_DBUS_ADDR "org.kde.StatusNotifierWatcher" #define NOTIFICATION_WATCHER_DBUS_OBJ "/StatusNotifierWatcher" -- cgit v1.2.3