Final icon-path merge.

4 files changed, 24 insertions, 16 deletions

diff --git a/docs/reference/tmpl/libappindicator-unused.sgml b/docs/reference/tmpl/libappindicator-unused.sgml
index e69de29..1428b51 100644
--- a/docs/reference/tmpl/libappindicator-unused.sgml
+++ b/docs/reference/tmpl/libappindicator-unused.sgml
@@ -0,0 +1,6 @@
+<!-- ##### ARG AppIndicator:icon-path ##### -->
+<para>
+
+</para>
+
+
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 1ac309a..f76bbe2 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -40,7 +40,7 @@ static gboolean _application_service_server_get_applications (ApplicationService
 #define NOTIFICATION_ITEM_PROP_STATUS     "Status"
 #define NOTIFICATION_ITEM_PROP_ICON_NAME  "IconName"
 #define NOTIFICATION_ITEM_PROP_AICON_NAME "AttentionIconName"
-#define NOTIFICATION_ITEM_PROP_ICON_PATH  "IconPath"
+#define NOTIFICATION_ITEM_PROP_ICON_PATH  "IconThemePath"
 #define NOTIFICATION_ITEM_PROP_MENU       "Menu"
 
 /* Private Stuff */
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index f1a363c..9a2e2a1 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -92,7 +92,7 @@ enum {
 	PROP_STATUS,
 	PROP_ICON_NAME,
 	PROP_ATTENTION_ICON_NAME,
-	PROP_ICON_PATH,
+	PROP_ICON_THEME_PATH,
 	PROP_MENU,
 	PROP_CONNECTED
 };
@@ -103,7 +103,7 @@ enum {
 #define PROP_STATUS_S                "status"
 #define PROP_ICON_NAME_S             "icon-name"
 #define PROP_ATTENTION_ICON_NAME_S   "attention-icon-name"
-#define PROP_ICON_PATH_S             "icon-path"
+#define PROP_ICON_THEME_PATH_S       "icon-theme-path"
 #define PROP_MENU_S                  "menu"
 #define PROP_CONNECTED_S             "connected"
 
@@ -183,8 +183,8 @@ app_indicator_class_init (AppIndicatorClass *klass)
                                                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
 	g_object_class_install_property(object_class,
-	                                PROP_ICON_PATH,
-	                                g_param_spec_string (PROP_ICON_PATH_S,
+	                                PROP_ICON_THEME_PATH,
+	                                g_param_spec_string (PROP_ICON_THEME_PATH_S,
                                                              "An additional path for custom icons.",
                                                              "An additional place to look for icon names that may be installed by the application.",
                                                              NULL,
@@ -440,7 +440,7 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu
                                             g_value_get_string (value));
         break;
 
-        case PROP_ICON_PATH:
+        case PROP_ICON_THEME_PATH:
 			if (priv->icon_path != NULL) {
 				g_free(priv->icon_path);
 			}
@@ -486,7 +486,7 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa
           g_value_set_string (value, priv->attention_icon_name);
           break;
 
-        case PROP_ICON_PATH:
+        case PROP_ICON_THEME_PATH:
           g_value_set_string (value, priv->icon_path);
           break;
 
@@ -592,9 +592,9 @@ app_indicator_new (const gchar          *id,
                    AppIndicatorCategory  category)
 {
   AppIndicator *indicator = g_object_new (APP_INDICATOR_TYPE,
-                                          "id", id,
-                                          "category", category_from_enum (category),
-                                          "icon-name", icon_name,
+                                          PROP_ID_S, id,
+                                          PROP_CATEGORY_S, category_from_enum (category),
+                                          PROP_ICON_NAME_S, icon_name,
                                           NULL);
 
   return indicator;
@@ -610,7 +610,7 @@ app_indicator_new (const gchar          *id,
 		Creates a new #AppIndicator setting the properties:
 		#AppIndicator::id with @id, #AppIndicator::category
 		with @category, #AppIndicator::icon-name with
-		@icon_name and #AppIndicator::icon-path with @icon_path.
+		@icon_name and #AppIndicator::icon-theme-path with @icon_path.
 
         Return value: A pointer to a new #AppIndicator object.
  */
@@ -621,10 +621,10 @@ app_indicator_new_with_path (const gchar          *id,
                              const gchar          *icon_path)
 {
 	AppIndicator *indicator = g_object_new (APP_INDICATOR_TYPE,
-	                                        "id", id,
-	                                        "category", category_from_enum (category),
-	                                        "icon-name", icon_name,
-	                                        "icon-path", icon_path,
+	                                        PROP_ID_S, id,
+	                                        PROP_CATEGORY_S, category_from_enum (category),
+	                                        PROP_ICON_NAME_S, icon_name,
+	                                        PROP_ICON_THEME_PATH_S, icon_path,
 	                                        NULL);
 
 	return indicator;
diff --git a/src/notification-item.xml b/src/notification-item.xml
index 6b3eeee..bcc3a4a 100644
--- a/src/notification-item.xml
+++ b/src/notification-item.xml
@@ -8,7 +8,9 @@
 		<property name="Status" type="s" access="read" />
 		<property name="IconName" type="s" access="read" />
 		<property name="AttentionIconName" type="s" access="read" />
-		<property name="IconPath" type="s" access="read" />
+		<!-- An additional path to add to the theme search path
+		     to find the icons specified above. -->
+		<property name="IconThemePath" type="s" access="read" />
 		<property name="Menu" type="o" access="read" />
 
 <!-- Methods -->