debian/changelog

+mate-indicator-applet (1.22.0-2) unstable; urgency=medium
+
+  [ Martin Wimpress ]
+  * debian/patches:
+    + Add 0001_resize_indicator_icons_to_fit_panel.patch. Resize indicator
+      icons to fit panel.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Thu, 08 Aug 2019 13:14:55 +0200
+
 mate-indicator-applet (1.22.0-1) unstable; urgency=medium
 
   [ Martin Wimpress ]

debian/patches/0001_resize_indicator_icons_to_fit_panel.patch

@@ -12,11 +12,9 @@ This fixes two issues:
  src/applet-main.c | 48 ++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 39 insertions(+), 9 deletions(-)
 
-diff --git a/src/applet-main.c b/src/applet-main.c
-index 2ac065f..d84fd1c 100644
 --- a/src/applet-main.c
 +++ b/src/applet-main.c
-@@ -96,6 +96,7 @@ static gchar * indicator_order[] = {
+@@ -96,6 +96,7 @@
  
  static GtkPackDirection packdirection;
  static MatePanelAppletOrient orient;
@@ -24,7 +22,7 @@ index 2ac065f..d84fd1c 100644
  
  #define  MENU_DATA_INDICATOR_OBJECT  "indicator-object"
  #define  MENU_DATA_INDICATOR_ENTRY   "indicator-entry"
-@@ -323,6 +324,29 @@ accessible_desc_update (IndicatorObject * io, IndicatorObjectEntry * entry, GtkW
+@@ -323,6 +324,29 @@
  	return;
  }
  
@@ -54,7 +52,7 @@ index 2ac065f..d84fd1c 100644
  static void
  entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
  {
-@@ -344,6 +368,8 @@ entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * men
+@@ -344,6 +368,8 @@
  	g_signal_connect(G_OBJECT(menuitem), "scroll-event", G_CALLBACK(entry_scrolled), entry);
  
  	if (entry->image != NULL) {
@@ -63,7 +61,7 @@ index 2ac065f..d84fd1c 100644
  		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 1);
  		if (gtk_widget_get_visible(GTK_WIDGET(entry->image))) {
  			something_visible = TRUE;
-@@ -552,7 +578,7 @@ update_accessible_desc(IndicatorObjectEntry * entry, GtkWidget * menuitem)
+@@ -552,7 +578,7 @@
  }
  
  static void
@@ -72,7 +70,7 @@ index 2ac065f..d84fd1c 100644
  {
  	/* Set the environment it's in */
  	indicator_object_set_environment(io, (const GStrv)indicator_env);
-@@ -576,6 +602,9 @@ load_indicator (GtkWidget * menubar, IndicatorObject *io, const gchar *name)
+@@ -576,6 +602,9 @@
  	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_MENU_SHOW,     G_CALLBACK(menu_show),      menubar);
  	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, G_CALLBACK(accessible_desc_update), menubar);
  
@@ -82,7 +80,7 @@ index 2ac065f..d84fd1c 100644
  	/* Work on the entries */
  	GList * entries = indicator_object_get_entries(io);
  	GList * entry = NULL;
-@@ -589,7 +618,7 @@ load_indicator (GtkWidget * menubar, IndicatorObject *io, const gchar *name)
+@@ -589,7 +618,7 @@
  }
  
  static gboolean
@@ -91,7 +89,7 @@ index 2ac065f..d84fd1c 100644
  {
  	g_debug("Looking at Module: %s", name);
  	g_return_val_if_fail(name != NULL, FALSE);
-@@ -605,13 +634,13 @@ load_module (const gchar * name, GtkWidget * menubar)
+@@ -605,13 +634,13 @@
  	IndicatorObject * io = indicator_object_new_from_file(fullpath);
  	g_free(fullpath);
  
@@ -107,7 +105,7 @@ index 2ac065f..d84fd1c 100644
  {
  	if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
  		GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL);
-@@ -636,7 +665,7 @@ load_modules (GtkWidget *menubar, gint *indicators_loaded)
+@@ -636,7 +665,7 @@
  				continue;
  			}
  #endif
@@ -116,7 +114,7 @@ index 2ac065f..d84fd1c 100644
  				count++;
  			}
  		}
-@@ -650,7 +679,7 @@ load_modules (GtkWidget *menubar, gint *indicators_loaded)
+@@ -650,7 +679,7 @@
  #if HAVE_AYATANA_INDICATOR_NG || HAVE_UBUNTU_INDICATOR_NG
  
  static void
@@ -125,7 +123,7 @@ index 2ac065f..d84fd1c 100644
  {
  	GDir *dir;
  	const gchar *name;
-@@ -693,7 +722,7 @@ load_indicators_from_indicator_files (GtkWidget *menubar, gint *indicators_loade
+@@ -693,7 +722,7 @@
  #endif
  
  		if (indicator) {
@@ -134,7 +132,7 @@ index 2ac065f..d84fd1c 100644
  			count++;
  		}else{
  			g_warning ("unable to load '%s': %s", name, error->message);
-@@ -994,6 +1023,7 @@ applet_fill_cb (MatePanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
+@@ -993,6 +1022,7 @@
  	gtk_widget_set_name(GTK_WIDGET (applet), "fast-user-switch-applet");
  
  	/* Build menubar */
@@ -142,7 +140,7 @@ index 2ac065f..d84fd1c 100644
  	orient = (mate_panel_applet_get_orient(applet));
  	packdirection = ((orient == MATE_PANEL_APPLET_ORIENT_UP) ||
  			(orient == MATE_PANEL_APPLET_ORIENT_DOWN)) ?
-@@ -1011,9 +1041,9 @@ applet_fill_cb (MatePanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
+@@ -1010,9 +1040,9 @@
  	/* Add in filter func */
  	tomboy_keybinder_bind(hotkey_keycode, hotkey_filter, menubar);
  

debian/patches/1001_secondary-activate.patch

@@ -3,7 +3,7 @@ Author: Hanno Meyer-Thurow <h.mth@web.de>
 
 --- a/src/applet-main.c
 +++ b/src/applet-main.c
-@@ -303,6 +303,42 @@
+@@ -304,6 +304,42 @@
  	return FALSE;
  }
  
@@ -46,7 +46,7 @@ Author: Hanno Meyer-Thurow <h.mth@web.de>
  static void
  accessible_desc_update_cb (GtkWidget * widget, gpointer userdata)
  {
-@@ -336,12 +372,16 @@
+@@ -360,12 +396,16 @@
  
  	/* Allows indicators to receive mouse scroll event */
  	gtk_widget_add_events(GTK_WIDGET(menuitem), GDK_SCROLL_MASK);
@@ -62,4 +62,4 @@ Author: Hanno Meyer-Thurow <h.mth@web.de>
 +	g_signal_connect(G_OBJECT(menuitem), "button-release-event", G_CALLBACK(entry_released), entry);
  
  	if (entry->image != NULL) {
- 		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 1);
+ 		/* Resize to fit panel */