aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-01-13 18:26:32 -0600
committerKen VanDine <ken.vandine@canonical.com>2011-01-13 18:26:32 -0600
commit0b264400127942e9210ba97217d7ebc2a0727cbf (patch)
treeb76a6c7f8b25cc2b0838e8651bfca0a488e775db /src
parent087e6316977fbd3f870ce6d7b734de9765f6eed2 (diff)
parent0e9f42a12daf9bc3f14f6dd7dcc7efb33a22fa94 (diff)
downloadlibayatana-appindicator-0b264400127942e9210ba97217d7ebc2a0727cbf.tar.gz
libayatana-appindicator-0b264400127942e9210ba97217d7ebc2a0727cbf.tar.bz2
libayatana-appindicator-0b264400127942e9210ba97217d7ebc2a0727cbf.zip
merged
* avoid nulls when crafting variants * use notdir in case make gives us full paths
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/app-indicator.c16
2 files changed, 10 insertions, 10 deletions
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 ";" >> $@
diff --git a/src/app-indicator.c b/src/app-indicator.c
index babdaf5..40959bf 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -909,21 +909,21 @@ 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);
+ 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);
}