From 62c7490c8d18ed4f4e0c7b4ab63d518e12cbd168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 2 Jul 2011 05:05:39 +0200 Subject: Use the "entry-scrolled" signal instead of the old ones It follows the API change of libindicator --- src/indicator-application.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/indicator-application.c') diff --git a/src/indicator-application.c b/src/indicator-application.c index 2b26c92..fd24c27 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -109,7 +109,7 @@ static void indicator_application_dispose (GObject *object); static void indicator_application_finalize (GObject *object); static GList * get_entries (IndicatorObject * io); static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry); -static void scroll_entry (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction); +static void entry_scrolled (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction); void connection_changed (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application); static void connected (IndicatorApplication * application); static void disconnected (IndicatorApplication * application); @@ -144,7 +144,7 @@ indicator_application_class_init (IndicatorApplicationClass *klass) io_class->get_entries = get_entries; io_class->get_location = get_location; - io_class->scroll_entry = scroll_entry; + io_class->entry_scrolled = entry_scrolled; return; } @@ -403,7 +403,7 @@ get_location (IndicatorObject * io, IndicatorObjectEntry * entry) } /* Redirect the scroll event to the Application Item */ -static void scroll_entry (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction) { +static void entry_scrolled (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction) { g_return_if_fail(IS_INDICATOR_APPLICATION(io)); -- cgit v1.2.3 From 2902ab6999b56ac01fc07ce529018dfa467ca80b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 10:16:51 -0500 Subject: Setting the name hints through the stack. --- src/indicator-application.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'src/indicator-application.c') diff --git a/src/indicator-application.c b/src/indicator-application.c index fd24c27..358c0a6 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -116,7 +116,7 @@ static void disconnected (IndicatorApplication * application); static void disconnected_helper (gpointer data, gpointer user_data); static gboolean disconnected_kill (gpointer user_data); static void disconnected_kill_helper (gpointer data, gpointer user_data); -static void application_added (IndicatorApplication * application, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, const gchar * accessible_desc); +static void application_added (IndicatorApplication * application, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, const gchar * accessible_desc, const gchar * hint); static void application_removed (IndicatorApplication * application, gint position); static void application_label_changed (IndicatorApplication * application, gint position, const gchar * label, const gchar * guide); static void application_icon_changed (IndicatorApplication * application, gint position, const gchar * iconname, const gchar * icondesc); @@ -469,7 +469,7 @@ guess_label_size (ApplicationEntry * app) ApplicationEntry and signaling the indicator host that we've got a new indicator. */ static void -application_added (IndicatorApplication * application, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, const gchar * accessible_desc) +application_added (IndicatorApplication * application, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, const gchar * accessible_desc, const gchar * hint) { g_return_if_fail(IS_INDICATOR_APPLICATION(application)); g_debug("Building new application entry: %s with icon: %s at position %i", dbusaddress, iconname, position); @@ -524,6 +524,12 @@ application_added (IndicatorApplication * application, const gchar * iconname, g app->entry.accessible_desc = g_strdup(accessible_desc); } + if (hint == NULL || hint[0] == '\0') { + app->entry.name_hint = NULL; + } else { + app->entry.name_hint = g_strdup(hint); + } + app->entry.menu = GTK_MENU(dbusmenu_gtkmenu_new((gchar *)dbusaddress, (gchar *)dbusobject)); /* Keep copies of these for ourself, just in case. */ @@ -580,6 +586,12 @@ application_removed (IndicatorApplication * application, gint position) if (app->entry.menu != NULL) { g_object_unref(G_OBJECT(app->entry.menu)); } + if (app->entry.accessible_desc != NULL) { + g_object_unref(G_OBJECT(app->entry.accessible_desc)); + } + if (app->entry.name_hint != NULL) { + g_object_unref(G_OBJECT(app->entry.name_hint)); + } g_free(app); return; @@ -775,13 +787,14 @@ receive_signal (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name, const gchar * label; const gchar * guide; const gchar * accessible_desc; - g_variant_get (parameters, "(&si&s&o&s&s&s&s)", &iconname, + const gchar * hint; + g_variant_get (parameters, "(&si&s&o&s&s&s&s&s)", &iconname, &position, &dbusaddress, &dbusobject, &icon_theme_path, &label, &guide, - &accessible_desc); + &accessible_desc, &hint); application_added(self, iconname, position, dbusaddress, dbusobject, icon_theme_path, label, guide, - accessible_desc); + accessible_desc, hint); } else if (g_strcmp0(signal_name, "ApplicationRemoved") == 0) { gint position; @@ -872,11 +885,12 @@ get_applications_helper (IndicatorApplication * self, GVariant * variant) const gchar * label; const gchar * guide; const gchar * accessible_desc; - g_variant_get(variant, "(sisossss)", &icon_name, &position, + const gchar * hint; + g_variant_get(variant, "(sisosssss)", &icon_name, &position, &dbus_address, &dbus_object, &icon_theme_path, &label, - &guide, &accessible_desc); + &guide, &accessible_desc, &hint); - return application_added(self, icon_name, position, dbus_address, dbus_object, icon_theme_path, label, guide, accessible_desc); + return application_added(self, icon_name, position, dbus_address, dbus_object, icon_theme_path, label, guide, accessible_desc, hint); } /* Unrefs a theme directory. This may involve removing it from -- cgit v1.2.3 From 510e1e13fafca7393baa20f5afa4567b87c2d224 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 10:39:10 -0500 Subject: Oops, should be a free --- src/indicator-application.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/indicator-application.c') diff --git a/src/indicator-application.c b/src/indicator-application.c index 358c0a6..dc810f4 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -587,10 +587,10 @@ application_removed (IndicatorApplication * application, gint position) g_object_unref(G_OBJECT(app->entry.menu)); } if (app->entry.accessible_desc != NULL) { - g_object_unref(G_OBJECT(app->entry.accessible_desc)); + g_free((gchar *)app->entry.accessible_desc); } if (app->entry.name_hint != NULL) { - g_object_unref(G_OBJECT(app->entry.name_hint)); + g_free((gchar *)app->entry.name_hint); } g_free(app); -- cgit v1.2.3