Merge lp:~3v1n0/libappindicator/discord-indicator-crash-fix into lp:libappindicator

[Marco Trevisan (Treviño)]

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2020-04-08 15:23:22 +0000
+++ debian/changelog	2020-04-08 18:57:21 +0000
@@ -1,3 +1,15 @@
+libappindicator (12.10.1+18.04.20180322.1-0ubuntu7) UNRELEASED; urgency=medium
+
+  [ Paul G ]
+  * app-indicator: Don't pass unexpected parameter to signal emissions
+    (LP: #1867996)
+
+  [ Ash Holland ]
+  * app-indicator: Only check for item numbers when iterating array
+    (LP: #1867996)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 08 Apr 2020 17:55:12 +0200
+
 libappindicator (12.10.1+18.04.20180322.1-0ubuntu6) focal; urgency=medium
 
   * Disable mono on riscv64 too.
 
=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2019-02-20 23:40:32 +0000
+++ src/app-indicator.c	2020-04-08 18:57:21 +0000
@@ -508,7 +508,7 @@
 	                                  G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
 	                                  NULL, NULL,
 	                                  g_cclosure_marshal_VOID__VOID,
-	                                  G_TYPE_NONE, 0, G_TYPE_NONE);
+	                                  G_TYPE_NONE, 0);
 
 	/**
 	 * AppIndicator::new-attention-icon:
@@ -522,7 +522,7 @@
 	                                            G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
 	                                            NULL, NULL,
 	                                            g_cclosure_marshal_VOID__VOID,
-	                                            G_TYPE_NONE, 0, G_TYPE_NONE);
+	                                            G_TYPE_NONE, 0);
 
 	/**
 	 * AppIndicator::new-status:
@@ -570,7 +570,7 @@
 	                                            G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
 	                                            NULL, NULL,
 	                                            g_cclosure_marshal_VOID__BOOLEAN,
-	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
+	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
 	/**
 	 * AppIndicator::new-icon-theme-path:
@@ -1280,7 +1280,7 @@
 	gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
 
 	g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
-	              label, guide, TRUE);
+	              label, guide);
 	if (priv->dbus_registration != 0 && priv->connection != NULL) {
 		GError * error = NULL;
 
@@ -1496,7 +1496,7 @@
 static void
 theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
 {
-	g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE);
+	g_signal_emit (user_data, signals[NEW_ICON], 0);
 
 	AppIndicator * self = (AppIndicator *)user_data;
 	AppIndicatorPrivate *priv = self->priv;
@@ -1616,7 +1616,7 @@
 		gint n_elements, i;
 		gboolean found=FALSE;
 		gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
-		for (i=0; i< n_elements || path[i] == NULL; i++) {
+		for (i=0; i< n_elements; i++) {
 			if(g_strcmp0(path[i], theme_path) == 0) {
 				found=TRUE;
 				break;
@@ -1922,7 +1922,7 @@
 	}
 
 	if (changed) {
-		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
+		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
 
 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
 			GError * error = NULL;
@@ -2008,7 +2008,7 @@
 	}
 
 	if (changed) {
-		g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
+		g_signal_emit (self, signals[NEW_ICON], 0);
 
 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
 			GError * error = NULL;
@@ -2137,7 +2137,7 @@
 		g_free (self->priv->absolute_icon_theme_path);
 		self->priv->absolute_icon_theme_path = get_real_theme_path (self);
 
-		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE);
+		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path);
 
 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
 			const gchar *theme_path = self->priv->absolute_icon_theme_path ?