From 077275b799305cc99a5c20a5fbe43cc2121ce618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Tue, 22 Nov 2011 08:36:34 +0100 Subject: Make building tests optional --- Makefile.am | 5 ++++- configure.ac | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5920abe..e19101d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,9 +4,12 @@ SUBDIRS = \ src \ bindings \ example \ - tests \ docs +if WANT_TESTS +SUBDIRS += tests +endif + EXTRA_DIST = \ m4/introspection.m4 \ gtk-doc.make \ diff --git a/configure.ac b/configure.ac index d271627..b05f967 100644 --- a/configure.ac +++ b/configure.ac @@ -189,6 +189,14 @@ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" AC_SUBST(PYGTK_CODEGEN) AC_MSG_RESULT($PYGTK_CODEGEN) +######################### +# Check if build tests +######################### +AC_ARG_ENABLE([tests], + AC_HELP_STRING([--disable-tests], [Disable tests]),, + [enable_tests=yes]) +AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) + ########################### # Files ########################### @@ -226,4 +234,5 @@ Libappindicator Configuration: Prefix: $prefix GTK+ Version: $with_gtk + Tests: $enable_tests ]) -- cgit v1.2.3 From 4777acb01158d1a39ad5f57a73812d4d3bf9e0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Tue, 22 Nov 2011 08:42:36 +0100 Subject: Fix header files location for GTK3 --- src/appindicator3-0.1.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in index 0ffe409..f59ac70 100644 --- a/src/appindicator3-0.1.pc.in +++ b/src/appindicator3-0.1.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -Cflags: -I${includedir}/libappindicator-0.1 +Cflags: -I${includedir}/libappindicator3-0.1 Requires: dbusmenu-glib-0.4 gtk+-3.0 Libs: -L${libdir} -lappindicator3 -- cgit v1.2.3 From c101b27f98d83e7ad2e8c36bed7eda202aab4ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Tue, 22 Nov 2011 08:43:20 +0100 Subject: Do not link pyglib explicitly --- bindings/python/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 0b606db..7febc11 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -19,7 +19,7 @@ pkgappindicator_PYTHON = __init__.py appindicatordir = $(pkgpyexecdir)/appindicator appindicator_LTLIBRARIES = _appindicator.la -_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator -lpyglib-2.0-python2.6 +_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator _appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator _appindicator_la_SOURCES = appindicatormodule.c nodist__appindicator_la_SOURCES = appindicator.c -- cgit v1.2.3 From 1798a73298c603506b571d515893ac21d4b38413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Tue, 22 Nov 2011 21:53:38 +0100 Subject: Use the standard location for mono bindings --- bindings/mono/Makefile.am | 2 +- bindings/mono/appindicator-sharp-0.1.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 9a899e1..6df22d0 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -29,7 +29,7 @@ TARGET = \ $(DLLPOLICY1) \ $(POLICY1).config -assemblydir = $(libdir)/cli/appindicator-sharp-0.1 +assemblydir = $(libdir)/mono/appindicator-sharp assembly_DATA = $(TARGET) CLEANFILES = \ diff --git a/bindings/mono/appindicator-sharp-0.1.pc.in b/bindings/mono/appindicator-sharp-0.1.pc.in index 11ae719..dc245e7 100644 --- a/bindings/mono/appindicator-sharp-0.1.pc.in +++ b/bindings/mono/appindicator-sharp-0.1.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -assemblies_dir=${libdir}/cli/appindicator-sharp-0.1 +assemblies_dir=${libdir}/mono/appindicator-sharp Name: appindicator-sharp Description: application indicators for .NET -- cgit v1.2.3 From ce8b8824e6c8b690e1f8dbd66779ecad8e03334b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Wed, 23 Nov 2011 03:47:46 +0100 Subject: Make building mono tests optional. Check for mono-nunit if nunit is not available --- bindings/mono/Makefile.am | 26 ++++++++++++++++++++++---- configure.ac | 21 ++++++++++++++++++++- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 9a899e1..5bb13ab 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -3,7 +3,9 @@ SUBDIRS = . examples pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = appindicator-sharp-0.1.pc +if BUILD_MONO_TEST TEST = AppIndicator.Test.dll +endif API = libappindicator-api.xml MIDDLE_API = libappindicator-api.middle @@ -40,16 +42,24 @@ CLEANFILES = \ $(API) \ $(MIDDLE_API) \ $(RAW_API) \ - $(TEST) \ $(DLLPOLICY) \ $(DLLPOLICY1) \ $(WRAPPER_FREE_BINDING) \ $(POLICY).config \ $(POLICY1).config +if BUILD_MONO_TEST +CLEANFILES += $(TEST) +endif + DISTCLEANFILES = $(ASSEMBLY).config + +if BUILD_MONO_TEST TEST_SOURCES = TestIndicator.cs +endif + customs = ApplicationIndicator.custom + EXTRA_DIST = \ AssemblyInfo.cs \ $(RAW_API) \ @@ -60,13 +70,19 @@ EXTRA_DIST = \ $(ASSEMBLY_NAME).snk \ $(POLICY).config.in \ $(POLICY1).config.in \ - $(customs) \ - $(TEST_SOURCES) + $(customs) + +if BUILD_MONO_TEST +EXTRA_DIST += $(TEST_SOURCES) +endif GACUTIL_FLAGS=-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib references = $(GTK_SHARP_LIBS) -test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY) + +if BUILD_MONO_TEST +test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) $(MONO_NUNIT_LIBS) -r:$(ASSEMBLY) +endif $(RAW_API): app-indicator.sources.xml $(WRAPPER_FREE_BINDING) $(GAPI_PARSER) $(srcdir)/app-indicator.sources.xml @@ -130,10 +146,12 @@ uninstall-local: echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ $(GACUTIL) -u $(POLICY) $(GACUTIL_FLAGS) || exit 1; +if BUILD_MONO_TEST $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) +endif $(POLICY).config: $(POLICY).config.in Makefile sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ diff --git a/configure.ac b/configure.ac index b05f967..fe2d754 100644 --- a/configure.ac +++ b/configure.ac @@ -153,7 +153,25 @@ AC_SUBST(GAPI_CODEGEN) AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) AC_SUBST(GAPI_FIXUP) -PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7) +# Check for nunit +AC_ARG_ENABLE([mono-test], + AC_HELP_STRING([--disable-mono-test], [Disable mono test]),, + [enable_mono_test=auto]) + +if test x"$enable_mono_test" != x"no" ; then + PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7, + [have_nunit=yes], + [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit, + [have_nunit=yes], + [have_nunit=no]) + ]) + if test x${enable_mono_test} = xyes && test x${have_nunit} = xno; then + AC_MSG_ERROR([Mono test configured but nunit not found]) + fi +else + have_nunit=no +fi +AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes) ########################### # Check to see if we're local @@ -235,4 +253,5 @@ Libappindicator Configuration: Prefix: $prefix GTK+ Version: $with_gtk Tests: $enable_tests + Mono tests: $have_nunit ]) -- cgit v1.2.3 From a89fe2cf130a13d8eebe14c0344071c0fd7641c5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 20:48:50 -0600 Subject: Adding get/set title functions --- src/app-indicator.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/app-indicator.h | 3 +++ 2 files changed, 45 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index f885cc7..17d6261 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -2126,6 +2126,30 @@ app_indicator_set_secondary_activate_target (AppIndicator *self, GtkWidget *menu g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self); } +/** + * app_indicator_set_title: + * @self: The #AppIndicator + * @title: (allow-none): Title of the app indicator + * + * Sets the title of the application indicator, or how it should be referred + * in a human readable form. This string should be UTF-8 and localized as it + * expected that users will set it. + * + * In the Unity desktop the most prominate place that this is show will be + * in the HUD. HUD listings for this application indicator will start with + * the title as the first part of the line for the menu items. + * + * Setting @title to %NULL removes the title. + */ +void +app_indicator_set_title (AppIndicator *self, const gchar * title) +{ + g_return_if_fail (IS_APP_INDICATOR (self)); + + + return; +} + /** * app_indicator_get_id: * @self: The #AppIndicator object to use @@ -2254,6 +2278,24 @@ app_indicator_get_attention_icon_desc (AppIndicator *self) return self->priv->att_accessible_desc; } +/** + * app_indicator_get_title: + * @self: The #AppIndicator object to use + * + * Gets the title of the application indicator. See the function + * app_indicator_set_title() for information on the title. + * + * Return value: The current title. + */ +const gchar * +app_indicator_get_title (AppIndicator *self) +{ + g_return_val_if_fail (IS_APP_INDICATOR (self), NULL); + + return NULL; +} + + /** * app_indicator_get_menu: * @self: The #AppIndicator object to use diff --git a/src/app-indicator.h b/src/app-indicator.h index 6922248..8ae20b0 100644 --- a/src/app-indicator.h +++ b/src/app-indicator.h @@ -285,6 +285,8 @@ void app_indicator_set_ordering_index (AppIndicator guint32 ordering_index); void app_indicator_set_secondary_activate_target (AppIndicator *self, GtkWidget *menuitem); +void app_indicator_set_title (AppIndicator *self, + const gchar *title); /* Get properties */ const gchar * app_indicator_get_id (AppIndicator *self); @@ -295,6 +297,7 @@ const gchar * app_indicator_get_icon_desc (AppIndic const gchar * app_indicator_get_icon_theme_path (AppIndicator *self); const gchar * app_indicator_get_attention_icon (AppIndicator *self); const gchar * app_indicator_get_attention_icon_desc (AppIndicator *self); +const gchar * app_indicator_get_title (AppIndicator *self); GtkMenu * app_indicator_get_menu (AppIndicator *self); const gchar * app_indicator_get_label (AppIndicator *self); -- cgit v1.2.3 From fb6509958adc6b571ea7c067507a2d269cbae539 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 20:57:06 -0600 Subject: Adding a title entry to the private structure --- src/app-indicator.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index 17d6261..f1caf82 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -78,6 +78,7 @@ struct _AppIndicatorPrivate { GtkWidget *sec_activate_target; gboolean sec_activate_enabled; guint32 ordering_index; + gchar * title; gchar * label; gchar * label_guide; gchar * accessible_desc; @@ -575,6 +576,7 @@ app_indicator_init (AppIndicator *self) priv->menu = NULL; priv->menuservice = NULL; priv->ordering_index = 0; + priv->title = NULL; priv->label = NULL; priv->label_guide = NULL; priv->label_change_idle = 0; @@ -716,6 +718,11 @@ app_indicator_finalize (GObject *object) priv->icon_theme_path = NULL; } + if (priv->title != NULL) { + g_free(priv->title); + priv->title = NULL; + } + if (priv->label != NULL) { g_free(priv->label); priv->label = NULL; -- cgit v1.2.3 From 3c1556cb30938195c6646d203f949912d7af5c4e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 21:10:32 -0600 Subject: Adding the title property --- src/app-indicator.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index f1caf82..f29d08e 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -128,7 +128,8 @@ enum { PROP_LABEL, PROP_LABEL_GUIDE, PROP_ORDERING_INDEX, - PROP_DBUS_MENU_SERVER + PROP_DBUS_MENU_SERVER, + PROP_TITLE }; /* The strings so that they can be slowly looked up. */ @@ -145,6 +146,7 @@ enum { #define PROP_LABEL_GUIDE_S "label-guide" #define PROP_ORDERING_INDEX_S "ordering-index" #define PROP_DBUS_MENU_SERVER_S "dbus-menu-server" +#define PROP_TITLE_S "title" /* Private macro, shhhh! */ #define APP_INDICATOR_GET_PRIVATE(o) \ @@ -252,7 +254,7 @@ app_indicator_class_init (AppIndicatorClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY)); /** - * AppIndicator: + * AppIndicator:status: * * Whether the indicator is shown or requests attention. Defaults to * 'Passive'. @@ -411,6 +413,21 @@ app_indicator_class_init (AppIndicatorClass *klass) "DBusmenu server which is available for testing the application indicators.", DBUSMENU_TYPE_SERVER, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + /** + * AppIndicator:title: + * + * Provides a way to refer to this application indicator in a human + * readable form. This is used in the Unity desktop in the HUD as + * the first part of the menu entries to distinguish them from the + * focused application's entries. + */ + g_object_class_install_property(object_class, + PROP_TITLE, + g_param_spec_string (PROP_TITLE_S, + "Title of the application indicator", + "A human readable way to refer to this application indicator in the UI.", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /* Signals */ @@ -837,20 +854,38 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu gchar * oldlabel = priv->label; priv->label = g_value_dup_string(value); - if (g_strcmp0(oldlabel, priv->label) != 0) { - signal_label_change(APP_INDICATOR(object)); - } - if (priv->label != NULL && priv->label[0] == '\0') { g_free(priv->label); priv->label = NULL; } + if (g_strcmp0(oldlabel, priv->label) != 0) { + signal_label_change(APP_INDICATOR(object)); + } + if (oldlabel != NULL) { g_free(oldlabel); } break; } + case PROP_TITLE: { + gchar * oldtitle = priv->title; + priv->title = g_value_dup_string(value); + + if (priv->title != NULL && priv->title[0] == '\0') { + g_free(priv->title); + priv->title = NULL; + } + + if (g_strcmp0(oldtitle, priv->title) != 0) { + // signal_title_change(APP_INDICATOR(object)); + } + + if (oldtitle != NULL) { + g_free(oldtitle); + } + break; + } case PROP_LABEL_GUIDE: { gchar * oldguide = priv->label_guide; priv->label_guide = g_value_dup_string(value); -- cgit v1.2.3 From e5b9bc347ccaf27c351fbcb2305db5dc5816e5e0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 21:16:29 -0600 Subject: Adding the 'Title' property and 'NewTitle' signal to the DBus interface description --- src/notification-item.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/notification-item.xml b/src/notification-item.xml index 589a438..c93afd7 100644 --- a/src/notification-item.xml +++ b/src/notification-item.xml @@ -10,6 +10,7 @@ + @@ -46,6 +47,8 @@ + + -- cgit v1.2.3 From 3aa66a7c29f62a0d862ad04f9d61d61bee9a23ef Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 21:22:14 -0600 Subject: Support the title property over dbus and emitting the dbus signal when it changes --- src/app-indicator.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index f29d08e..bb44e50 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -878,7 +878,20 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu } if (g_strcmp0(oldtitle, priv->title) != 0) { - // signal_title_change(APP_INDICATOR(object)); + GError * error = NULL; + + g_dbus_connection_emit_signal(self->priv->connection, + NULL, + self->priv->path, + NOTIFICATION_ITEM_DBUS_IFACE, + "NewTitle", + NULL, + &error); + + if (error != NULL) { + g_warning("Unable to send signal for NewTitle: %s", error->message); + g_error_free(error); + } } if (oldtitle != NULL) { @@ -1104,6 +1117,8 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * 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, "Title") == 0) { + return g_variant_new_string(priv->title ? priv->title : ""); } else if (g_strcmp0(property, "IconThemePath") == 0) { return g_variant_new_string(priv->icon_theme_path ? priv->icon_theme_path : ""); } else if (g_strcmp0(property, "Menu") == 0) { -- cgit v1.2.3 From f12cf320a0d665e2c304b4415aac3cedfaf559a1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 21:36:19 -0600 Subject: Make the set function call the property set function --- src/app-indicator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index bb44e50..0d27cb2 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -2203,6 +2203,9 @@ app_indicator_set_title (AppIndicator *self, const gchar * title) { g_return_if_fail (IS_APP_INDICATOR (self)); + g_object_set(G_OBJECT(self), + PROP_TITLE_S, title == NULL ? "": title, + NULL); return; } -- cgit v1.2.3 From 84ba24014072bc09f8200d252c6e8a35b00e593c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 21:38:55 -0600 Subject: Setting the titles in the examples --- example/simple-client-vala.vala | 1 + example/simple-client.c | 1 + 2 files changed, 2 insertions(+) diff --git a/example/simple-client-vala.vala b/example/simple-client-vala.vala index 8d661ce..1b8bad9 100644 --- a/example/simple-client-vala.vala +++ b/example/simple-client-vala.vala @@ -46,6 +46,7 @@ class SimpleClient { ci.set_status(IndicatorStatus.ACTIVE); ci.set_attention_icon("indicator-messages-new"); ci.set_label("1%", "100%"); + ci.set_title("Test Indicator (vala)"); active = true; can_haz_label = true; diff --git a/example/simple-client.c b/example/simple-client.c index dcee81b..6d67955 100644 --- a/example/simple-client.c +++ b/example/simple-client.c @@ -167,6 +167,7 @@ main (int argc, char ** argv) app_indicator_set_status (ci, APP_INDICATOR_STATUS_ACTIVE); app_indicator_set_attention_icon_full(ci, "indicator-messages-new", "System Messages Icon Highlighted"); app_indicator_set_label (ci, "1%", "100%"); + app_indicator_set_title (ci, "Test Inidcator"); g_signal_connect (ci, "scroll-event", G_CALLBACK (scroll_event_cb), NULL); -- cgit v1.2.3 From 2d03f1d2b167e4b0ca56d4034e039cbfb9ffbd70 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 21:42:34 -0600 Subject: Adding a test to track setting of the title --- tests/test-libappindicator.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index cadf783..7afd3ba 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -123,10 +123,12 @@ test_libappindicator_init_set_props (void) app_indicator_set_status(ci, APP_INDICATOR_STATUS_ACTIVE); app_indicator_set_attention_icon(ci, "my-attention-name"); + app_indicator_set_title(ci, "My Title"); g_assert(!g_strcmp0("my-id", app_indicator_get_id(ci))); g_assert(!g_strcmp0("my-name", app_indicator_get_icon(ci))); g_assert(!g_strcmp0("my-attention-name", app_indicator_get_attention_icon(ci))); + g_assert(!g_strcmp0("My Title", app_indicator_get_title(ci))); g_assert(app_indicator_get_status(ci) == APP_INDICATOR_STATUS_ACTIVE); g_assert(app_indicator_get_category(ci) == APP_INDICATOR_CATEGORY_APPLICATION_STATUS); -- cgit v1.2.3 From dcbd590c7c1a61560c9dfa2636a467e7e2332c6d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 21:45:02 -0600 Subject: Only signal to dbus if we're connected --- src/app-indicator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 0d27cb2..54a2b6a 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -877,7 +877,7 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu priv->title = NULL; } - if (g_strcmp0(oldtitle, priv->title) != 0) { + if (g_strcmp0(oldtitle, priv->title) != 0 && self->priv->connection != NULL) { GError * error = NULL; g_dbus_connection_emit_signal(self->priv->connection, -- cgit v1.2.3 From 97d2b40745a0049fcf0be430ab9715c9e050bc3b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 21:45:34 -0600 Subject: Making get_title work --- src/app-indicator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 54a2b6a..f3f8b9d 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -2352,7 +2352,7 @@ app_indicator_get_title (AppIndicator *self) { g_return_val_if_fail (IS_APP_INDICATOR (self), NULL); - return NULL; + return self->priv->title; } -- cgit v1.2.3 From 982de618938bc5f9bc1224492970ccb06bc3a00a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 21:46:45 -0600 Subject: Handling getting the title property --- src/app-indicator.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index f3f8b9d..6b4110c 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1011,6 +1011,10 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa g_value_set_object(value, priv->menuservice); break; + case PROP_TITLE: + g_value_set_string(value, priv->title); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -- cgit v1.2.3 From 8b21de2008070e371e7690aab74a18bb2020e141 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 28 Jan 2012 21:50:05 -0600 Subject: Adding the get/set function to the docs --- docs/reference/libappindicator-sections.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/reference/libappindicator-sections.txt b/docs/reference/libappindicator-sections.txt index 6f09364..d9e1196 100644 --- a/docs/reference/libappindicator-sections.txt +++ b/docs/reference/libappindicator-sections.txt @@ -32,6 +32,7 @@ app_indicator_set_icon_theme_path app_indicator_set_label app_indicator_set_ordering_index app_indicator_set_secondary_activate_target +app_indicator_set_title app_indicator_get_id app_indicator_get_category app_indicator_get_status @@ -45,6 +46,7 @@ app_indicator_get_label app_indicator_get_label_guide app_indicator_get_ordering_index app_indicator_get_secondary_activate_target +app_indicator_get_title app_indicator_build_menu_from_desktop -- cgit v1.2.3 From f0e992803d3e05c69da1202f1c73cedcb50c8445 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Jan 2012 22:51:10 -0600 Subject: Fix type in comment --- src/app-indicator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 6b4110c..6c693e8 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_target (AppIndicator *self, GtkWidget *menu * in a human readable form. This string should be UTF-8 and localized as it * expected that users will set it. * - * In the Unity desktop the most prominate place that this is show will be + * In the Unity desktop the most prominent place that this is show will be * in the HUD. HUD listings for this application indicator will start with * the title as the first part of the line for the menu items. * -- cgit v1.2.3 -- cgit v1.2.3 From 67380abc295dca8bc122c7dc2b6de94998e0cc91 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 31 Jan 2012 20:59:34 -0600 Subject: Changing dbusmenu-gtk required version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fe2d754..6db1617 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,7 @@ GTK3_REQUIRED_VERSION=2.91 GLIB_REQUIRED_VERSION=2.26 GIO_REQUIRED_VERSION=2.26 INDICATOR_REQUIRED_VERSION=0.3.5 -DBUSMENUGTK_REQUIRED_VERSION=0.3.94 +DBUSMENUGTK_REQUIRED_VERSION=0.5.90 DBUS_GLIB_REQUIRED_VERSION=0.82 AC_ARG_WITH([gtk], -- cgit v1.2.3 From 53fbf0df52f22cd43c3838d3e22c59ca0a1a1961 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Feb 2012 13:31:38 -0600 Subject: 0.4.90 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6db1617..127307e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libappindicator], - [0.4.1], + [0.4.90], [http://bugs.launchpad.net/libappindicator], [libappindicator], [http://launchpad.net/libappindicator]) -- cgit v1.2.3 From 4ccb5d75887671bce24df6eeaacd7eb89b2be189 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Feb 2012 13:40:14 -0600 Subject: Fixing some of the properties in the mono bindings --- bindings/mono/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 5bb13ab..f4a59a8 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -100,12 +100,14 @@ $(MIDDLE_API): $(METADATA) $(RAW_API) $(API): $(MIDDLE_API) Makefile.am sed -e "s|PROP_ID_S|id|" \ + -e "s|PROP_STATUS_S|Status|" \ -e "s|PROP_STATUS_S|status|" \ -e "s|PROP_CATEGORY_S|Category|" \ -e "s|PROP_CATEGORY_S|category|" \ -e "s|PROP_ICON_NAME_S|icon-name|" \ -e "s|PROP_ICON_DESC_S|IconDesc|" \ -e "s|PROP_ICON_DESC_S|icon-desc|" \ + -e "s|PROP_ATTENTION_ICON_NAME_S|AttentionIconName|" \ -e "s|PROP_ATTENTION_ICON_NAME_S|attention-icon-name|" \ -e "s|PROP_ATTENTION_ICON_DESC_S|AttentionIconDesc|" \ -e "s|PROP_ATTENTION_ICON_DESC_S|attention-icon-desc|" \ @@ -117,6 +119,8 @@ $(API): $(MIDDLE_API) Makefile.am -e "s|PROP_ORDERING_INDEX_S|ordering-index|" \ -e "s|PROP_DBUS_MENU_SERVER_S|DbusMenuServer|" \ -e "s|PROP_DBUS_MENU_SERVER_S|dbus-menu-server|" \ + -e "s|PROP_TITLE_S|Title|" \ + -e "s|PROP_TITLE_S|title|" \ $< > $@ api_includes = $(GTK_SHARP_CFLAGS) -- cgit v1.2.3 From 5ad59aaaa2004eb706751ac2bf8e2ed4467146b8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Feb 2012 14:50:50 -0600 Subject: debian/control: Dbusmneu Dep to 0.5.90 --- debian/changelog | 3 ++- debian/control | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 74ce8a3..5f2624a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ libappindicator (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Add title property (LP: #923971) * Don't specify pyglib-2.0-python2.6 in LDFLAGS * fix fallback icon of the GtkStatusIcon (LP: #820080) + * debian/control: Dbusmneu Dep to 0.5.90 - -- Ted Gould Fri, 03 Feb 2012 14:39:36 -0600 + -- Ted Gould Fri, 03 Feb 2012 14:50:33 -0600 libappindicator (0.4.1-0ubuntu4) precise; urgency=low diff --git a/debian/control b/debian/control index 1f2a597..f7d7dc4 100644 --- a/debian/control +++ b/debian/control @@ -18,9 +18,9 @@ Build-Depends: debhelper (>= 7.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), - libdbusmenu-glib-dev (>= 0.3.94), - libdbusmenu-gtk-dev (>= 0.3.94), - libdbusmenu-gtk3-dev (>= 0.3.94), + libdbusmenu-glib-dev (>= 0.5.90), + libdbusmenu-gtk-dev (>= 0.5.90), + libdbusmenu-gtk3-dev (>= 0.5.90), cli-common-dev (>= 0.5.7), mono-devel (>= 2.4.3), gtk-sharp2-gapi, -- cgit v1.2.3 From f149e800c57034da9d0052fe65a4952b068e7d9b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Feb 2012 14:55:57 -0600 Subject: deibna/*symbols: Updated to add [set|get]_title functions --- debian/changelog | 3 ++- debian/libappindicator1.symbols | 2 ++ debian/libappindicator3-1.symbols | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5f2624a..45ddeff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ libappindicator (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Don't specify pyglib-2.0-python2.6 in LDFLAGS * fix fallback icon of the GtkStatusIcon (LP: #820080) * debian/control: Dbusmneu Dep to 0.5.90 + * deibna/*symbols: Updated to add [set|get]_title functions - -- Ted Gould Fri, 03 Feb 2012 14:50:33 -0600 + -- Ted Gould Fri, 03 Feb 2012 14:55:33 -0600 libappindicator (0.4.1-0ubuntu4) precise; urgency=low diff --git a/debian/libappindicator1.symbols b/debian/libappindicator1.symbols index 0ee8bd0..ded488e 100644 --- a/debian/libappindicator1.symbols +++ b/debian/libappindicator1.symbols @@ -14,6 +14,7 @@ libappindicator.so.1 libappindicator1 #MINVER# app_indicator_get_ordering_index@Base 0.2.91 app_indicator_get_secondary_activate_target@Base 0.3.91 app_indicator_get_status@Base 0.2.91 + app_indicator_get_title@Base 0.4.90 app_indicator_get_type@Base 0.2.91 app_indicator_new@Base 0.2.91 app_indicator_new_with_path@Base 0.2.91 @@ -27,4 +28,5 @@ libappindicator.so.1 libappindicator1 #MINVER# app_indicator_set_ordering_index@Base 0.2.91 app_indicator_set_secondary_activate_target@Base 0.3.91 app_indicator_set_status@Base 0.2.91 + app_indicator_set_title@Base 0.4.90 app_indicator_status_get_type@Base 0.2.91 diff --git a/debian/libappindicator3-1.symbols b/debian/libappindicator3-1.symbols index 0dc29aa..3b63f22 100644 --- a/debian/libappindicator3-1.symbols +++ b/debian/libappindicator3-1.symbols @@ -14,6 +14,7 @@ libappindicator3.so.1 libappindicator3-1 #MINVER# app_indicator_get_ordering_index@Base 0.2.92 app_indicator_get_secondary_activate_target@Base 0.3.91 app_indicator_get_status@Base 0.2.92 + app_indicator_get_title@Base 0.4.90 app_indicator_get_type@Base 0.2.92 app_indicator_new@Base 0.2.92 app_indicator_new_with_path@Base 0.2.92 @@ -27,4 +28,5 @@ libappindicator3.so.1 libappindicator3-1 #MINVER# app_indicator_set_ordering_index@Base 0.2.92 app_indicator_set_secondary_activate_target@Base 0.3.91 app_indicator_set_status@Base 0.2.92 + app_indicator_set_title@Base 0.4.90 app_indicator_status_get_type@Base 0.2.92 -- cgit v1.2.3 From 0ef39fd36500773506b9571cc9475874850a35f1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Feb 2012 15:04:49 -0600 Subject: releasing version 0.4.90-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 45ddeff..63f44a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libappindicator (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low +libappindicator (0.4.90-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Fix include with Dbusmenu 0.5.90 @@ -9,7 +9,7 @@ libappindicator (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * debian/control: Dbusmneu Dep to 0.5.90 * deibna/*symbols: Updated to add [set|get]_title functions - -- Ted Gould Fri, 03 Feb 2012 14:55:33 -0600 + -- Ted Gould Fri, 03 Feb 2012 15:04:46 -0600 libappindicator (0.4.1-0ubuntu4) precise; urgency=low -- cgit v1.2.3