Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-indicator-applet
Commits:
-
59c7765b
by Mike Gabriel at 2019-07-10T11:07:51Z
-
b30570a0
by Mike Gabriel at 2019-07-10T11:07:51Z
-
aa416561
by Mike Gabriel at 2019-07-10T11:07:51Z
-
35e06e97
by Mike Gabriel at 2019-07-10T11:09:08Z
-
2d0f7b96
by Mike Gabriel at 2019-07-31T14:44:58Z
-
5caf7bfc
by Mike Gabriel at 2019-07-31T14:46:24Z
-
1e05b17f
by Mike Gabriel at 2019-07-31T14:49:08Z
7 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/1001_secondary-activate.patch
- + debian/patches/series
- debian/rules
Changes:
1 |
-mate-indicator-applet (1.22.0-1) UNRELEASED; urgency=medium
|
|
1 |
+mate-indicator-applet (1.22.0-1) unstable; urgency=medium
|
|
2 | 2 |
|
3 |
+ [ Martin Wimpress ]
|
|
3 | 4 |
* New upstream release.
|
4 | 5 |
|
5 |
- -- Martin Wimpress <martin.wimpress@ubuntu.com> Mon, 18 Mar 2019 20:30:23 +0000
|
|
6 |
+ [ Mike Gabriel ]
|
|
7 |
+ * debian/patches:
|
|
8 |
+ + Add 1001_secondary-activate.patch. Add support for indicator object
|
|
9 |
+ signal: secondary-activate / INDICATOR_OBJECT_SIGNAL_SECONDARY_
|
|
10 |
+ ACTIVATE. (Closes: #927438).
|
|
11 |
+ * debian/{compat,control}:
|
|
12 |
+ + Use debhelper-compat notation. Bump to DH compat level version 12.
|
|
13 |
+ * debian/control:
|
|
14 |
+ + Bump Standards-Version: to 4.4.0. No changes needed.
|
|
15 |
+ * debian/rules:
|
|
16 |
+ + Drop dbgsym-migration dh_strip override.
|
|
17 |
+ * debian/copyright:
|
|
18 |
+ + Update copyright attributions.
|
|
19 |
+ |
|
20 |
+ -- Mike Gabriel <sunweaver@debian.org> Wed, 31 Jul 2019 16:45:20 +0200
|
|
6 | 21 |
|
7 | 22 |
mate-indicator-applet (1.20.1-1) unstable; urgency=medium
|
8 | 23 |
|
1 |
-11
|
... | ... | @@ -7,7 +7,7 @@ Uploaders: Mike Gabriel <sunweaver@debian.org>, |
7 | 7 |
Stefano Karapetsas <stefano@karapetsas.com>,
|
8 | 8 |
Vangelis Mouhtsis <vangelis@gnugr.org>,
|
9 | 9 |
Martin Wimpress <code@flexion.org>,
|
10 |
-Build-Depends: debhelper (>= 11~),
|
|
10 |
+Build-Depends: debhelper-compat (=12),
|
|
11 | 11 |
dpkg-dev (>= 1.16.1.1),
|
12 | 12 |
intltool,
|
13 | 13 |
libgtk-3-dev,
|
... | ... | @@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 11~), |
18 | 18 |
libx11-dev,
|
19 | 19 |
libxml2-dev,
|
20 | 20 |
mate-common (>= 1.18),
|
21 |
-Standards-Version: 4.3.0
|
|
21 |
+Standards-Version: 4.4.0
|
|
22 | 22 |
Homepage: http://www.mate-desktop.org
|
23 | 23 |
Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-indicator-applet
|
24 | 24 |
Vcs-Git: https://salsa.debian.org/debian-mate-team/mate-indicator-applet.git
|
... | ... | @@ -21,7 +21,8 @@ Copyright: 2002, Red Hat, Inc. |
21 | 21 |
1998-2001, Tim Janik
|
22 | 22 |
License: LGPL-2+
|
23 | 23 |
|
24 |
-Files: .tx/config
|
|
24 |
+Files: .travis.yml
|
|
25 |
+ .tx/config
|
|
25 | 26 |
.github/issue_template.md
|
26 | 27 |
data/Makefile.am
|
27 | 28 |
data/*.svg
|
... | ... | @@ -46,6 +47,7 @@ Comment: |
46 | 47 |
and COPYING.LGPL files.
|
47 | 48 |
|
48 | 49 |
Files: mate-indicator-applet.pot
|
50 |
+ po/LINGUAS
|
|
49 | 51 |
po/*.po
|
50 | 52 |
Copyright: 2009-2010, Rosetta Contributors and Canonical Ltd.
|
51 | 53 |
THE PACKAGE'S COPYRIGHT HOLDER
|
1 |
+Description: Support mouse middle-click on indicator to emit signal "secondary-activate".
|
|
2 |
+Author: Hanno Meyer-Thurow <h.mth@web.de>
|
|
3 |
+ |
|
4 |
+--- a/src/applet-main.c
|
|
5 |
++++ b/src/applet-main.c
|
|
6 |
+@@ -303,6 +303,42 @@
|
|
7 |
+ return FALSE;
|
|
8 |
+ }
|
|
9 |
+
|
|
10 |
++static gboolean
|
|
11 |
++entry_pressed (GtkWidget *menuitem, GdkEvent *event, gpointer data)
|
|
12 |
++{
|
|
13 |
++ g_return_val_if_fail(GTK_IS_MENU_ITEM(menuitem), FALSE);
|
|
14 |
++
|
|
15 |
++ if (((GdkEventButton*)event)->button == 2) /* middle button */
|
|
16 |
++ {
|
|
17 |
++ gtk_widget_grab_focus(menuitem);
|
|
18 |
++
|
|
19 |
++ return TRUE;
|
|
20 |
++ }
|
|
21 |
++
|
|
22 |
++ return FALSE;
|
|
23 |
++}
|
|
24 |
++
|
|
25 |
++static gboolean
|
|
26 |
++entry_released (GtkWidget *menuitem, GdkEvent *event, gpointer data)
|
|
27 |
++{
|
|
28 |
++ g_return_val_if_fail(GTK_IS_MENU_ITEM(menuitem), FALSE);
|
|
29 |
++
|
|
30 |
++ if (((GdkEventButton*)event)->button == 2) /* middle button */
|
|
31 |
++ {
|
|
32 |
++ IndicatorObject *io = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_OBJECT);
|
|
33 |
++ IndicatorObjectEntry *entry = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_ENTRY);
|
|
34 |
++
|
|
35 |
++ g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE);
|
|
36 |
++
|
|
37 |
++ g_signal_emit_by_name (io, INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, entry,
|
|
38 |
++ ((GdkEventButton*)event)->time);
|
|
39 |
++
|
|
40 |
++ return TRUE;
|
|
41 |
++ }
|
|
42 |
++
|
|
43 |
++ return FALSE;
|
|
44 |
++}
|
|
45 |
++
|
|
46 |
+ static void
|
|
47 |
+ accessible_desc_update_cb (GtkWidget * widget, gpointer userdata)
|
|
48 |
+ {
|
|
49 |
+@@ -336,12 +372,16 @@
|
|
50 |
+
|
|
51 |
+ /* Allows indicators to receive mouse scroll event */
|
|
52 |
+ gtk_widget_add_events(GTK_WIDGET(menuitem), GDK_SCROLL_MASK);
|
|
53 |
++ gtk_widget_add_events(GTK_WIDGET(menuitem), GDK_BUTTON_PRESS_MASK);
|
|
54 |
++ gtk_widget_add_events(GTK_WIDGET(menuitem), GDK_BUTTON_RELEASE_MASK);
|
|
55 |
+
|
|
56 |
+ g_object_set_data (G_OBJECT (menuitem), "indicator", io);
|
|
57 |
+ g_object_set_data (G_OBJECT (menuitem), "box", box);
|
|
58 |
+
|
|
59 |
+ g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(entry_activated), entry);
|
|
60 |
+ g_signal_connect(G_OBJECT(menuitem), "scroll-event", G_CALLBACK(entry_scrolled), entry);
|
|
61 |
++ g_signal_connect(G_OBJECT(menuitem), "button-press-event", G_CALLBACK(entry_pressed), entry);
|
|
62 |
++ g_signal_connect(G_OBJECT(menuitem), "button-release-event", G_CALLBACK(entry_released), entry);
|
|
63 |
+
|
|
64 |
+ if (entry->image != NULL) {
|
|
65 |
+ gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 1);
|
1 |
+1001_secondary-activate.patch
|
... | ... | @@ -24,8 +24,5 @@ override_dh_auto_configure: |
24 | 24 |
--libexecdir=/usr/lib/mate-indicator-applet \
|
25 | 25 |
$(INDICATOR_IMPLEMENTATION)
|
26 | 26 |
|
27 |
-override_dh_strip:
|
|
28 |
- dh_strip --dbgsym-migration='mate-indicator-applet-dbg (<< 1.14.0-2~)'
|
|
29 |
- |
|
30 | 27 |
get-orig-source:
|
31 | 28 |
uscan --noconf --force-download --rename --download-current-version --destdir=..
|