[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/mate-indicator-applet][master] 2 commits: debian/patches: Rebase all patches.

Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-indicator-applet

Commits:

3 changed files:

Changes:

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

  • debian/patches/0001_resize_indicator_icons_to_fit_panel.patch
    ... ... @@ -12,11 +12,9 @@ This fixes two issues:
    12 12 
      src/applet-main.c | 48 ++++++++++++++++++++++++++++++++++++++---------
    13 13 
      1 file changed, 39 insertions(+), 9 deletions(-)
    14 14
    15 
    -diff --git a/src/applet-main.c b/src/applet-main.c
    16 
    -index 2ac065f..d84fd1c 100644
    17 15 
     --- a/src/applet-main.c
    18 16 
     +++ b/src/applet-main.c
    19 
    -@@ -96,6 +96,7 @@ static gchar * indicator_order[] = {
    17 
    +@@ -96,6 +96,7 @@
    20 18
    21 19 
      static GtkPackDirection packdirection;
    22 20 
      static MatePanelAppletOrient orient;
    ... ... @@ -24,7 +22,7 @@ index 2ac065f..d84fd1c 100644
    24 22
    25 23 
      #define  MENU_DATA_INDICATOR_OBJECT  "indicator-object"
    26 24 
      #define  MENU_DATA_INDICATOR_ENTRY   "indicator-entry"
    27 
    -@@ -323,6 +324,29 @@ accessible_desc_update (IndicatorObject * io, IndicatorObjectEntry * entry, GtkW
    25 
    +@@ -323,6 +324,29 @@
    28 26 
      	return;
    29 27 
      }
    30 28
    ... ... @@ -54,7 +52,7 @@ index 2ac065f..d84fd1c 100644
    54 52 
      static void
    55 53 
      entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
    56 54 
      {
    57 
    -@@ -344,6 +368,8 @@ entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * men
    55 
    +@@ -344,6 +368,8 @@
    58 56 
      	g_signal_connect(G_OBJECT(menuitem), "scroll-event", G_CALLBACK(entry_scrolled), entry);
    59 57
    60 58 
      	if (entry->image != NULL) {
    ... ... @@ -63,7 +61,7 @@ index 2ac065f..d84fd1c 100644
    63 61 
      		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 1);
    64 62 
      		if (gtk_widget_get_visible(GTK_WIDGET(entry->image))) {
    65 63 
      			something_visible = TRUE;
    66 
    -@@ -552,7 +578,7 @@ update_accessible_desc(IndicatorObjectEntry * entry, GtkWidget * menuitem)
    64 
    +@@ -552,7 +578,7 @@
    67 65 
      }
    68 66
    69 67 
      static void
    ... ... @@ -72,7 +70,7 @@ index 2ac065f..d84fd1c 100644
    72 70 
      {
    73 71 
      	/* Set the environment it's in */
    74 72 
      	indicator_object_set_environment(io, (const GStrv)indicator_env);
    75 
    -@@ -576,6 +602,9 @@ load_indicator (GtkWidget * menubar, IndicatorObject *io, const gchar *name)
    73 
    +@@ -576,6 +602,9 @@
    76 74 
      	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_MENU_SHOW,     G_CALLBACK(menu_show),      menubar);
    77 75 
      	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, G_CALLBACK(accessible_desc_update), menubar);
    78 76
    ... ... @@ -82,7 +80,7 @@ index 2ac065f..d84fd1c 100644
    82 80 
      	/* Work on the entries */
    83 81 
      	GList * entries = indicator_object_get_entries(io);
    84 82 
      	GList * entry = NULL;
    85 
    -@@ -589,7 +618,7 @@ load_indicator (GtkWidget * menubar, IndicatorObject *io, const gchar *name)
    83 
    +@@ -589,7 +618,7 @@
    86 84 
      }
    87 85
    88 86 
      static gboolean
    ... ... @@ -91,7 +89,7 @@ index 2ac065f..d84fd1c 100644
    91 89 
      {
    92 90 
      	g_debug("Looking at Module: %s", name);
    93 91 
      	g_return_val_if_fail(name != NULL, FALSE);
    94 
    -@@ -605,13 +634,13 @@ load_module (const gchar * name, GtkWidget * menubar)
    92 
    +@@ -605,13 +634,13 @@
    95 93 
      	IndicatorObject * io = indicator_object_new_from_file(fullpath);
    96 94 
      	g_free(fullpath);
    97 95
    ... ... @@ -107,7 +105,7 @@ index 2ac065f..d84fd1c 100644
    107 105 
      {
    108 106 
      	if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
    109 107 
      		GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL);
    110 
    -@@ -636,7 +665,7 @@ load_modules (GtkWidget *menubar, gint *indicators_loaded)
    108 
    +@@ -636,7 +665,7 @@
    111 109 
      				continue;
    112 110 
      			}
    113 111 
      #endif
    ... ... @@ -116,7 +114,7 @@ index 2ac065f..d84fd1c 100644
    116 114 
      				count++;
    117 115 
      			}
    118 116 
      		}
    119 
    -@@ -650,7 +679,7 @@ load_modules (GtkWidget *menubar, gint *indicators_loaded)
    117 
    +@@ -650,7 +679,7 @@
    120 118 
      #if HAVE_AYATANA_INDICATOR_NG || HAVE_UBUNTU_INDICATOR_NG
    121 119
    122 120 
      static void
    ... ... @@ -125,7 +123,7 @@ index 2ac065f..d84fd1c 100644
    125 123 
      {
    126 124 
      	GDir *dir;
    127 125 
      	const gchar *name;
    128 
    -@@ -693,7 +722,7 @@ load_indicators_from_indicator_files (GtkWidget *menubar, gint *indicators_loade
    126 
    +@@ -693,7 +722,7 @@
    129 127 
      #endif
    130 128
    131 129 
      		if (indicator) {
    ... ... @@ -134,7 +132,7 @@ index 2ac065f..d84fd1c 100644
    134 132 
      			count++;
    135 133 
      		}else{
    136 134 
      			g_warning ("unable to load '%s': %s", name, error->message);
    137 
    -@@ -994,6 +1023,7 @@ applet_fill_cb (MatePanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
    135 
    +@@ -993,6 +1022,7 @@
    138 136 
      	gtk_widget_set_name(GTK_WIDGET (applet), "fast-user-switch-applet");
    139 137
    140 138 
      	/* Build menubar */
    ... ... @@ -142,7 +140,7 @@ index 2ac065f..d84fd1c 100644
    142 140 
      	orient = (mate_panel_applet_get_orient(applet));
    143 141 
      	packdirection = ((orient == MATE_PANEL_APPLET_ORIENT_UP) ||
    144 142 
      			(orient == MATE_PANEL_APPLET_ORIENT_DOWN)) ?
    145 
    -@@ -1011,9 +1041,9 @@ applet_fill_cb (MatePanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
    143 
    +@@ -1010,9 +1040,9 @@
    146 144 
      	/* Add in filter func */
    147 145 
      	tomboy_keybinder_bind(hotkey_keycode, hotkey_filter, menubar);
    148 146

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

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: