diff options
| author | Ted Gould <ted@gould.cx> | 2010-01-08 11:04:12 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-01-08 11:04:12 -0600 |
| commit | 2b000f7fb8322eb1b8774b4d60ff5ec849e9cc9b (patch) | |
| tree | c589fe149ed3e9f3c6336663905ab9e7c5c63b62 /src/libappindicator | |
| parent | 458b67c8caa792c8176d494095c7eddd72600bf1 (diff) | |
| parent | 8226d6c8f8870be9d2902fcd2137b242f2559da8 (diff) | |
| download | ayatana-indicator-application-2b000f7fb8322eb1b8774b4d60ff5ec849e9cc9b.tar.gz ayatana-indicator-application-2b000f7fb8322eb1b8774b4d60ff5ec849e9cc9b.tar.bz2 ayatana-indicator-application-2b000f7fb8322eb1b8774b4d60ff5ec849e9cc9b.zip | |
Final icon-path merge.
Diffstat (limited to 'src/libappindicator')
| -rw-r--r-- | src/libappindicator/app-indicator.c | 28 |
1 files changed, 14 insertions, 14 deletions
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; |