aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-06-17 13:28:27 -0500
committerTed Gould <ted@gould.cx>2010-06-17 13:28:27 -0500
commit81e0ff2013b8fe37066ec77473c338ef55b15516 (patch)
tree42b55bf468a4645b32e43326942d028e3743250b
parent9119e0042cd92c811c561cff7713ef220e4c3efe (diff)
parentfc6b18bde0af75bff3710306a45fdf907e248c20 (diff)
downloadayatana-indicator-application-81e0ff2013b8fe37066ec77473c338ef55b15516.tar.gz
ayatana-indicator-application-81e0ff2013b8fe37066ec77473c338ef55b15516.tar.bz2
ayatana-indicator-application-81e0ff2013b8fe37066ec77473c338ef55b15516.zip
* Upstream Merge
* Making it so that icons can be changed at any time.
-rw-r--r--debian/changelog7
-rw-r--r--src/app-indicator.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index fb4f8a4..1e6d15e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-application (0.2.0-0ubuntu4~ppa2~icons1) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Making it so that icons can be changed at any time.
+
+ -- Ted Gould <ted@ubuntu.com> Thu, 17 Jun 2010 13:27:54 -0500
+
indicator-application (0.2.0-0ubuntu4~ppa1) lucid; urgency=low
* Upstream Merge
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 6c2a8d9..bc43e58 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -229,7 +229,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_CONSTRUCT));
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
AppIndicator:attention-icon-name: