Merge lp:~gber/libappindicator/fallback-tooltip into lp:libappindicator/16.10

[Guido Berhoerster]

Unmerged revisions

289. By Guido Berhoerster on 2018-07-13

Display a tooltip in fallback mode

This replicates the behavior of KDE Plasma or the Xfce Status Notifier
Plugin in fallback mode by displaying a tooltip with the contents of the
"title" and "icon-desc" or "attention-icon-desc" properties if set.

288. By CI Train Bot Account on 2018-03-22

Releasing 12.10.1+18.04.20180322.1-0ubuntu1

287. By Unit 193 on 2018-03-22

Have -dev package depend on libgtk2.0-dev or libgk-3-dev according to its pkgconfig file (LP: #1757574) (LP: #1757574)

Approved by: Jeremy Bicha

286. By CI Train Bot Account on 2018-03-20

Releasing 12.10.1+18.04.20180320-0ubuntu1

285. By Olivier Tilloy on 2018-03-20

Fix build failures on bionic,
and update Vcs-* fields in debian/control. (LP: #1757121)

Approved by: Marco Trevisan (Treviño)

284. By Didier Roche-Tolomelli on 2017-07-19

releasing package libappindicator version 12.10.1+17.04.20170215-0ubuntu2

283. By Didier Roche-Tolomelli on 2017-07-19

* debian/control:
  - Downgrade libappindicator* recommending the indicator-application
    service to suggests. Only some sessions wants it, while we still
    link against the lib in multiple apps.

282. By CI Train Bot Account on 2017-02-15

Releasing 12.10.1+17.04.20170215-0ubuntu1

281. By Marco Trevisan (Treviño) on 2017-02-15

app-indicator: don't append the snap prefix if the icon is saved in a well known readable path

280. By CI Train Bot Account on 2017-02-13

Releasing 12.10.1+17.04.20170213-0ubuntu1

=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2018-03-20 12:38:59 +0000
+++ src/app-indicator.c	2018-07-13 19:47:46 +0000
@@ -190,6 +190,7 @@
 static void status_icon_status_wrapper (AppIndicator * self, const gchar * status, gpointer data);
 static gboolean scroll_event_wrapper(GtkWidget *status_icon, GdkEventScroll *event, gpointer user_data);
 static gboolean middle_click_wrapper(GtkWidget *status_icon, GdkEventButton *event, gpointer user_data);
+static void status_icon_desc_changes (GObject * gobject, GParamSpec * pspec, gpointer data);
 static void status_icon_changes (AppIndicator * self, gpointer data);
 static void status_icon_activate (GtkStatusIcon * icon, gpointer data);
 static void status_icon_menu_activate (GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data);
@@ -1540,6 +1541,10 @@
 		G_CALLBACK(status_icon_changes), icon);
 	g_signal_connect(G_OBJECT(self), APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON,
 		G_CALLBACK(status_icon_changes), icon);
+	g_signal_connect(G_OBJECT(self), "notify::icon-desc",
+		G_CALLBACK(status_icon_desc_changes), icon);
+	g_signal_connect(G_OBJECT(self), "notify::attention-icon-desc",
+		G_CALLBACK(status_icon_desc_changes), icon);
 
 	status_icon_changes(self, icon);
 
@@ -1551,6 +1556,13 @@
 	return icon;
 }
 
+static void
+status_icon_desc_changes (GObject * gobject, GParamSpec * pspec, gpointer data)
+{
+	AppIndicator * self = APP_INDICATOR(gobject);
+	status_icon_changes(self, data);
+}
+
 /* A wrapper as the status update prototype is a little
    bit different, but we want to handle it the same. */
 static void
@@ -1598,6 +1610,27 @@
 	return FALSE;
 }
 
+static gchar *
+status_icon_tooltip_new (const gchar * title, const gchar * desc)
+{
+	gchar * tooltip;
+	gchar * title_escaped;
+	gchar * desc_escaped;
+
+	if (title == NULL && desc == NULL) {
+		return (NULL);
+	}
+
+	title_escaped = (title != NULL) ? g_markup_escape_text(title, -1) : g_strdup("");
+	desc_escaped = (desc != NULL) ? g_markup_escape_text(desc, -1) : g_strdup("");
+	tooltip = g_strdup_printf("<b>%s</b>%s%s", title_escaped,
+	    (title != NULL) && (desc != NULL) ? "\n" : "", desc_escaped);
+	g_free(desc_escaped);
+	g_free(title_escaped);
+
+	return tooltip;
+}
+
 /* This tracks changes to either the status or the icons
    that are associated with the app indicator */
 static void
@@ -1628,6 +1661,7 @@
 		g_strfreev (path);
 	}
 
+	gchar * tooltip = NULL;
 	const gchar * icon_name = NULL;
 	switch (app_indicator_get_status(self)) {
 	case APP_INDICATOR_STATUS_PASSIVE:
@@ -1637,14 +1671,19 @@
 		break;
 	case APP_INDICATOR_STATUS_ACTIVE:
 		icon_name = app_indicator_get_icon(self);
+		tooltip = status_icon_tooltip_new(app_indicator_get_title(self),
+		    app_indicator_get_icon_desc(self));
 		gtk_status_icon_set_visible(icon, TRUE);
 		break;
 	case APP_INDICATOR_STATUS_ATTENTION:
 		/* get the _attention_ icon here */
 		icon_name = app_indicator_get_attention_icon(self);
+		tooltip = status_icon_tooltip_new(app_indicator_get_title(self),
+		    app_indicator_get_attention_icon_desc(self));
 		gtk_status_icon_set_visible(icon, TRUE);
 		break;
 	};
+	gtk_status_icon_set_tooltip_markup(icon, tooltip);
 
 	if (icon_name != NULL) {
 		gchar *snapped_icon = append_snap_prefix(icon_name);
@@ -1668,6 +1707,8 @@
 		g_free(snapped_icon);
 	}
 
+	g_free(tooltip);
+
 	return;
 }
 
@@ -1706,6 +1747,7 @@
 {
 	g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_status_wrapper, status_icon);
 	g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_changes, status_icon);
+	g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_desc_changes, status_icon);
 	g_signal_handlers_disconnect_by_func(G_OBJECT(self), scroll_event_wrapper, status_icon);
 	g_signal_handlers_disconnect_by_func(G_OBJECT(self), middle_click_wrapper, status_icon);
 	gtk_status_icon_set_visible(status_icon, FALSE);