aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSense Hofstede <sense@ubuntu.com>2010-07-22 17:36:12 +0200
committerSense Hofstede <sense@ubuntu.com>2010-07-22 17:36:12 +0200
commit0a8c09e4f8ce284788845f465dcc826a67602cd0 (patch)
treee7ffa39541e9debe81f5bd60f57516c64ee0f5b6
parent0dbf34a46c0c39f4e4bcd6ac1de72523cb7e3b63 (diff)
downloadlibayatana-appindicator-0a8c09e4f8ce284788845f465dcc826a67602cd0.tar.gz
libayatana-appindicator-0a8c09e4f8ce284788845f465dcc826a67602cd0.tar.bz2
libayatana-appindicator-0a8c09e4f8ce284788845f465dcc826a67602cd0.zip
Fixed two G_PARAM_SPECS and made it even more possible to remove the
custom icon theme path.
-rw-r--r--src/app-indicator.c4
-rw-r--r--src/indicator-application.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 91b0ecd..7b74495 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -230,7 +230,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
"An icon for the indicator",
"The default icon that is shown for the indicator.",
NULL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT));
/**
AppIndicator:attention-icon-name:
@@ -257,7 +257,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
"An additional path for custom icons.",
"An additional place to look for icon names that may be installed by the application.",
NULL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT));
/**
AppIndicator:menu:
diff --git a/src/indicator-application.c b/src/indicator-application.c
index 1a7467d..066ea63 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -568,13 +568,13 @@ application_icon_theme_path_changed (DBusGProxy * proxy, gint position, const gc
return;
}
- if (icon_theme_path[0] != '\0' && g_strcmp0(icon_theme_path, app->icon_theme_path) != 0) {
+ if (g_strcmp0(icon_theme_path, app->icon_theme_path) != 0) {
if(app->icon_theme_path != NULL) {
theme_dir_unref(application, app->icon_theme_path);
g_free(app->icon_theme_path);
app->icon_theme_path = NULL;
}
- if (icon_theme_path != NULL ) {
+ if (icon_theme_path != NULL && icon_theme_path[0] != '\0') {
app->icon_theme_path = g_strdup(icon_theme_path);
theme_dir_ref(application, app->icon_theme_path);
}