From d74f7761f86dc241e72a54920a10a2117cec2f81 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 20 Aug 2010 10:13:16 -0500 Subject: Adding keyboard and ibus to overrides --- data/ordering-override.keyfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/ordering-override.keyfile b/data/ordering-override.keyfile index dcfb75b..ab1ffe1 100644 --- a/data/ordering-override.keyfile +++ b/data/ordering-override.keyfile @@ -1,2 +1,4 @@ [Ordering Index Overrides] gnome-power-manager=1 +gst-keyboard-xkb=2 +ibus=3 -- cgit v1.2.3 From 35924b4d7fc030773a78001fd046b1d2f8c985ad Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 20 Aug 2010 10:13:35 -0500 Subject: Handling the typo --- data/ordering-override.keyfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/ordering-override.keyfile b/data/ordering-override.keyfile index ab1ffe1..71d7c1a 100644 --- a/data/ordering-override.keyfile +++ b/data/ordering-override.keyfile @@ -1,4 +1,5 @@ [Ordering Index Overrides] gnome-power-manager=1 gst-keyboard-xkb=2 -ibus=3 +gsd-keyboard-xkb=3 +ibus=4 -- cgit v1.2.3 From 81de0483bc6a87ed5fe0913121247ea96eb83d61 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 20 Aug 2010 11:54:25 -0500 Subject: Get the proper position for an application when it becomes visible. --- src/application-service-appstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index f52ea2d..d5f9a81 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -621,7 +621,7 @@ apply_status (Application * app) g_signal_emit(G_OBJECT(app->appstore), signals[APPLICATION_ADDED], 0, newicon, - g_list_index(priv->applications, app), /* Position */ + get_position(app), /* Position */ app->dbus_name, app->menu, app->icon_theme_path, -- cgit v1.2.3 From 7b3e58bb6039478f0d937ab375271c724d317b56 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 26 Aug 2010 14:49:40 -0500 Subject: 0.2.6 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 035c9da..3f77cca 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.2.5, ted@canonical.com) +AC_INIT(indicator-application, 0.2.6, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.2.5) +AM_INIT_AUTOMAKE(indicator-application, 0.2.6) AM_MAINTAINER_MODE -- cgit v1.2.3 From d18fdf612dd29c64d43d8f39c9a53d62f562943a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Sep 2010 18:36:02 -0500 Subject: Logging status change --- src/application-service-appstore.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index d5f9a81..d2200e7 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -72,6 +72,8 @@ typedef enum { VISIBLE_STATE_SHOWN } visible_state_t; +#define STATE2STRING(x) ((x) == VISIBLE_STATE_HIDDEN ? "hidden" : "visible") + typedef struct _Approver Approver; struct _Approver { DBusGProxy * proxy; @@ -600,6 +602,8 @@ apply_status (Application * app) return; } + g_debug("Changing app state '%s' to %s", app->id, STATE2STRING(goal_state)); + /* This means we're going off line */ if (goal_state == VISIBLE_STATE_HIDDEN) { gint position = get_position(app); -- cgit v1.2.3 From 01ca0dc5240367fe714116a42917a9c349f98a83 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Sep 2010 19:21:43 -0500 Subject: Extra debugging info --- src/application-service-appstore.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index d2200e7..eaaec6b 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -487,6 +487,7 @@ get_position (Application * app) { } if (lapp == NULL) { + g_warning("Unable to find position for app '%s'", app->id); return -1; } @@ -499,6 +500,7 @@ static void application_free (Application * app) { if (app == NULL) return; + g_debug("Application free '%s'", app->id); /* Handle the case where this could be called by unref'ing one of the proxy objects. */ @@ -556,6 +558,7 @@ static void application_removed_cb (DBusGProxy * proxy, gpointer userdata) { Application * app = (Application *)userdata; + g_debug("Application proxy destroyed '%s'", app->id); /* Remove from the panel */ app->status = APP_INDICATOR_STATUS_PASSIVE; @@ -602,7 +605,7 @@ apply_status (Application * app) return; } - g_debug("Changing app state '%s' to %s", app->id, STATE2STRING(goal_state)); + g_debug("Changing app '%s' state from %s to %s", app->id, STATE2STRING(app->visible_state), STATE2STRING(goal_state)); /* This means we're going off line */ if (goal_state == VISIBLE_STATE_HIDDEN) { -- cgit v1.2.3 From c5603404da69d9e7137b840ba47ca58b5b739c4f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Sep 2010 19:22:05 -0500 Subject: Check for duplicate additions of applications and just rerequest properties. --- src/application-service-appstore.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index eaaec6b..7096382 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -131,6 +131,7 @@ static AppIndicatorCategory string_to_cat(const gchar * cat_string); static void approver_free (gpointer papprover, gpointer user_data); static void check_with_new_approver (gpointer papp, gpointer papprove); static void check_with_old_approver (gpointer papprove, gpointer papp); +static Application * find_application (ApplicationServiceAppstore * appstore, const gchar * address, const gchar * object); G_DEFINE_TYPE (ApplicationServiceAppstore, application_service_appstore, G_TYPE_OBJECT); @@ -855,10 +856,20 @@ application_service_appstore_application_add (ApplicationServiceAppstore * appst g_return_if_fail(dbus_name != NULL && dbus_name[0] != '\0'); g_return_if_fail(dbus_object != NULL && dbus_object[0] != '\0'); ApplicationServiceAppstorePrivate * priv = appstore->priv; + Application * app = find_application(appstore, dbus_name, dbus_object); + + if (app != NULL) { + g_warning("Application already exists! Rerequesting properties."); + org_freedesktop_DBus_Properties_get_all_async(app->prop_proxy, + NOTIFICATION_ITEM_DBUS_IFACE, + get_all_properties_cb, + app); + return; + } /* Build the application entry. This will be carried along until we're sure we've got everything. */ - Application * app = g_new0(Application, 1); + app = g_new0(Application, 1); app->validated = FALSE; app->dbus_name = g_strdup(dbus_name); -- cgit v1.2.3 From b39568de7075cfcda135161616dca1710765f1b9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Sep 2010 12:52:35 -0500 Subject: 0.2.7 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3f77cca..ebfc58f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.2.6, ted@canonical.com) +AC_INIT(indicator-application, 0.2.7, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.2.6) +AM_INIT_AUTOMAKE(indicator-application, 0.2.7) AM_MAINTAINER_MODE -- cgit v1.2.3 From 8e221f4cb70ca80278dc300afd59a5d9b538dc40 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 15 Sep 2010 11:12:42 -0500 Subject: Allowing updates if the item is visible. --- src/application-service-appstore.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 7096382..46118bb 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -602,7 +602,14 @@ apply_status (Application * app) } /* Nothing needs to change, we're good */ - if (app->visible_state == goal_state) { + if (app->visible_state == goal_state /* ) { */ + && goal_state == VISIBLE_STATE_HIDDEN) { + /* TODO: Uhg, this is a little wrong in that we're going to + send an icon every time the status changes and the indicator + is visible even though it might not be updating. But, at + this point we need a small patch that is harmless. In the + future we need to track which icon is shown and remove the + duplicate message. */ return; } -- cgit v1.2.3 From a4dc11aaecfcb3b51b427394c6fc3ba59fdae402 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 15 Sep 2010 14:41:06 -0500 Subject: 0.2.8 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ebfc58f..25e19c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.2.7, ted@canonical.com) +AC_INIT(indicator-application, 0.2.8, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.2.7) +AM_INIT_AUTOMAKE(indicator-application, 0.2.8) AM_MAINTAINER_MODE -- cgit v1.2.3 From c2aee8ac8876b03c1fcddaeca884620f973d698d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 15 Sep 2010 17:16:00 -0500 Subject: Adding a disthook for AUTHORS --- Makefile.am | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile.am b/Makefile.am index ba772b0..98e4a88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,3 +30,15 @@ dist-hook: else \ echo Failed to generate ChangeLog: not a branch >&2; \ fi + @if test -d "$(top_srcdir)/.bzr"; \ + then \ + echo Creating AUTHORS && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ + && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ + || (rm -f AUTHORS.tmp; \ + echo Failed to generate AUTHORS >&2 ); \ + else \ + echo Failed to generate AUTHORS: not a branch >&2; \ + fi -- cgit v1.2.3