libappindicator

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

  1. discord-indicator-crash-fix
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 297
Merged at revision: 295
Proposed branch: lp:~3v1n0/libappindicator/discord-indicator-crash-fix
Merge into: lp:libappindicator
Diff against target: 104 lines (+21/-9)
2 files modified
debian/changelog (+12/-0)
src/app-indicator.c (+9/-9)
To merge this branch: bzr merge lp:~3v1n0/libappindicator/discord-indicator-crash-fix
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Pending
Review via email: mp+381952@code.launchpad.net

This proposal supersedes a proposal from 2020-04-08.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) : Posted in a previous version of this proposal
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2020-04-08 15:23:22 +0000
3+++ debian/changelog 2020-04-08 18:57:21 +0000
4@@ -1,3 +1,15 @@
5+libappindicator (12.10.1+18.04.20180322.1-0ubuntu7) UNRELEASED; urgency=medium
6+
7+ [ Paul G ]
8+ * app-indicator: Don't pass unexpected parameter to signal emissions
9+ (LP: #1867996)
10+
11+ [ Ash Holland ]
12+ * app-indicator: Only check for item numbers when iterating array
13+ (LP: #1867996)
14+
15+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 08 Apr 2020 17:55:12 +0200
16+
17 libappindicator (12.10.1+18.04.20180322.1-0ubuntu6) focal; urgency=medium
18
19 * Disable mono on riscv64 too.
20
21=== modified file 'src/app-indicator.c'
22--- src/app-indicator.c 2019-02-20 23:40:32 +0000
23+++ src/app-indicator.c 2020-04-08 18:57:21 +0000
24@@ -508,7 +508,7 @@
25 G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
26 NULL, NULL,
27 g_cclosure_marshal_VOID__VOID,
28- G_TYPE_NONE, 0, G_TYPE_NONE);
29+ G_TYPE_NONE, 0);
30
31 /**
32 * AppIndicator::new-attention-icon:
33@@ -522,7 +522,7 @@
34 G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
35 NULL, NULL,
36 g_cclosure_marshal_VOID__VOID,
37- G_TYPE_NONE, 0, G_TYPE_NONE);
38+ G_TYPE_NONE, 0);
39
40 /**
41 * AppIndicator::new-status:
42@@ -570,7 +570,7 @@
43 G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
44 NULL, NULL,
45 g_cclosure_marshal_VOID__BOOLEAN,
46- G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
47+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
48
49 /**
50 * AppIndicator::new-icon-theme-path:
51@@ -1280,7 +1280,7 @@
52 gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
53
54 g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
55- label, guide, TRUE);
56+ label, guide);
57 if (priv->dbus_registration != 0 && priv->connection != NULL) {
58 GError * error = NULL;
59
60@@ -1496,7 +1496,7 @@
61 static void
62 theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
63 {
64- g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE);
65+ g_signal_emit (user_data, signals[NEW_ICON], 0);
66
67 AppIndicator * self = (AppIndicator *)user_data;
68 AppIndicatorPrivate *priv = self->priv;
69@@ -1616,7 +1616,7 @@
70 gint n_elements, i;
71 gboolean found=FALSE;
72 gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
73- for (i=0; i< n_elements || path[i] == NULL; i++) {
74+ for (i=0; i< n_elements; i++) {
75 if(g_strcmp0(path[i], theme_path) == 0) {
76 found=TRUE;
77 break;
78@@ -1922,7 +1922,7 @@
79 }
80
81 if (changed) {
82- g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
83+ g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
84
85 if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
86 GError * error = NULL;
87@@ -2008,7 +2008,7 @@
88 }
89
90 if (changed) {
91- g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
92+ g_signal_emit (self, signals[NEW_ICON], 0);
93
94 if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
95 GError * error = NULL;
96@@ -2137,7 +2137,7 @@
97 g_free (self->priv->absolute_icon_theme_path);
98 self->priv->absolute_icon_theme_path = get_real_theme_path (self);
99
100- g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE);
101+ g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path);
102
103 if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
104 const gchar *theme_path = self->priv->absolute_icon_theme_path ?

Subscribers

People subscribed via source and target branches