From b38d1d8a853bee2d08ce7ead3f0ffa00a6670cd6 Mon Sep 17 00:00:00 2001
From: Michael Terry <mike@mterry.name>
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(-)

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 <mike@mterry.name>
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(-)

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 <mike@mterry.name>
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(-)

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