Indicator Applet

Merge lp:~keturn/indicator-applet/cleanup-gcc-warnings into lp:indicator-applet/0.4

  1. cleanup-gcc-warnings
  2. Merge into applet
Proposed by Kevin Turner
Status: Merged
Merged at revision: not available
Proposed branch: lp:~keturn/indicator-applet/cleanup-gcc-warnings
Merge into: lp:indicator-applet/0.4
Diff against target: 200 lines (+57/-19)
3 files modified
.bzrignore (+30/-0)
src/applet-main.c (+23/-16)
src/tomboykeybinder.c (+4/-3)
To merge this branch: bzr merge lp:~keturn/indicator-applet/cleanup-gcc-warnings
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+23579@code.launchpad.net

Description of the change

this cleans up compiler warnings. no functional changes. I just wanted to have things clean before reviewing another branch.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Looks good!

  review approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2010-01-04 19:26:05 +0000
3+++ .bzrignore 2010-04-16 20:11:25 +0000
4@@ -107,3 +107,33 @@
5 src/indicator-applet-complete
6 src/indicator-applet-session
7 data/GNOME_IndicatorAppletComplete.server
8+INSTALL
9+Makefile
10+Makefile.in
11+aclocal.m4
12+autom4te.cache/
13+config.guess
14+config.h
15+config.h.in
16+config.log
17+config.status
18+config.sub
19+configure
20+depcomp
21+install-sh
22+libtool
23+ltmain.sh
24+missing
25+mkinstalldirs
26+stamp-h1
27+data/GNOME_FastUserSwitchApplet.server
28+data/Makefile
29+data/Makefile.in
30+po/.intltool-merge-cache
31+po/Makefile
32+po/Makefile.in
33+po/Makefile.in.in
34+po/POTFILES
35+po/stamp-it
36+src/Makefile
37+src/Makefile.in
38
39=== modified file 'src/applet-main.c'
40--- src/applet-main.c 2010-04-02 15:23:20 +0000
41+++ src/applet-main.c 2010-04-16 20:11:25 +0000
42@@ -26,7 +26,7 @@
43 #include <gdk/gdkkeysyms.h>
44
45 #include "libindicator/indicator-object.h"
46-
47+#include "tomboykeybinder.h"
48
49 static gchar * indicator_order[] = {
50 "libapplication.so",
51@@ -231,7 +231,8 @@
52 }
53
54 static void
55-entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data)
56+entry_removed (IndicatorObject * io G_GNUC_UNUSED, IndicatorObjectEntry * entry,
57+ gpointer user_data)
58 {
59 g_debug("Signal: Entry Removed");
60
61@@ -260,7 +261,8 @@
62
63 /* Gets called when an entry for an object was moved. */
64 static void
65-entry_moved (IndicatorObject * io, IndicatorObjectEntry * entry, gint old, gint new, gpointer user_data)
66+entry_moved (IndicatorObject * io, IndicatorObjectEntry * entry,
67+ gint old G_GNUC_UNUSED, gint new G_GNUC_UNUSED, gpointer user_data)
68 {
69 GtkWidget * menu = GTK_WIDGET(user_data);
70
71@@ -332,7 +334,7 @@
72 }
73
74 static void
75-hotkey_filter (char * keystring, gpointer data)
76+hotkey_filter (char * keystring G_GNUC_UNUSED, gpointer data)
77 {
78 g_return_if_fail(GTK_IS_MENU_SHELL(data));
79
80@@ -357,7 +359,7 @@
81 static gboolean
82 menubar_press (GtkWidget * widget,
83 GdkEventButton *event,
84- gpointer data)
85+ gpointer data G_GNUC_UNUSED)
86 {
87 if (event->button != 1) {
88 g_signal_stop_emission_by_name(widget, "button-press-event");
89@@ -367,22 +369,23 @@
90 }
91
92 static gboolean
93-menubar_scroll (GtkWidget *widget,
94+menubar_scroll (GtkWidget *widget G_GNUC_UNUSED,
95 GdkEventScroll *event,
96- gpointer data)
97+ gpointer data G_GNUC_UNUSED)
98 {
99 GtkWidget *menuitem;
100- GtkWidget *parent;
101
102 menuitem = gtk_get_event_widget ((GdkEvent *)event);
103
104 IndicatorObject *io = g_object_get_data (G_OBJECT (menuitem), "indicator");
105 g_signal_emit_by_name (io, "scroll", 1, event->direction);
106+
107+ return FALSE;
108 }
109
110 static gboolean
111 menubar_on_expose (GtkWidget * widget,
112- GdkEventExpose *event,
113+ GdkEventExpose *event G_GNUC_UNUSED,
114 GtkWidget * menubar)
115 {
116 if (GTK_WIDGET_HAS_FOCUS(menubar))
117@@ -393,9 +396,9 @@
118 }
119
120 static void
121-about_cb (BonoboUIComponent *ui_container,
122- gpointer data,
123- const gchar *cname)
124+about_cb (BonoboUIComponent *ui_container G_GNUC_UNUSED,
125+ gpointer data G_GNUC_UNUSED,
126+ const gchar *cname G_GNUC_UNUSED)
127 {
128 static const gchar *authors[] = {
129 "Ted Gould <ted@canonical.com>",
130@@ -448,14 +451,18 @@
131 #define N_(x) x
132
133 static void
134-log_to_file_cb (GObject * source_obj, GAsyncResult * result, gpointer user_data)
135+log_to_file_cb (GObject * source_obj G_GNUC_UNUSED,
136+ GAsyncResult * result G_GNUC_UNUSED, gpointer user_data)
137 {
138 g_free(user_data);
139 return;
140 }
141
142 static void
143-log_to_file (const gchar * domain, GLogLevelFlags level, const gchar * message, gpointer data)
144+log_to_file (const gchar * domain G_GNUC_UNUSED,
145+ GLogLevelFlags level G_GNUC_UNUSED,
146+ const gchar * message,
147+ gpointer data G_GNUC_UNUSED)
148 {
149 if (log_file == NULL) {
150 GError * error = NULL;
151@@ -500,7 +507,8 @@
152 }
153
154 static gboolean
155-applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data)
156+applet_fill_cb (PanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
157+ gpointer data G_GNUC_UNUSED)
158 {
159 static const BonoboUIVerb menu_verbs[] = {
160 BONOBO_UI_VERB ("IndicatorAppletAbout", about_cb),
161@@ -512,7 +520,6 @@
162 "</popup>";
163
164 GtkWidget *menubar;
165- gint i;
166 gint indicators_loaded = 0;
167 static gboolean first_time = FALSE;
168
169
170=== modified file 'src/tomboykeybinder.c'
171--- src/tomboykeybinder.c 2010-03-02 22:24:00 +0000
172+++ src/tomboykeybinder.c 2010-04-16 20:11:25 +0000
173@@ -79,7 +79,7 @@
174 caps_lock_mask | scroll_lock_mask,
175 num_lock_mask | caps_lock_mask | scroll_lock_mask,
176 };
177- int i;
178+ guint i;
179
180 for (i = 0; i < G_N_ELEMENTS (mod_masks); i++) {
181 if (grab) {
182@@ -162,7 +162,8 @@
183 }
184
185 static GdkFilterReturn
186-filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
187+filter_func (GdkXEvent *gdk_xevent, GdkEvent *event G_GNUC_UNUSED,
188+ gpointer data G_GNUC_UNUSED)
189 {
190 GdkFilterReturn return_val = GDK_FILTER_CONTINUE;
191 XEvent *xevent = (XEvent *) gdk_xevent;
192@@ -213,7 +214,7 @@
193 }
194
195 static void
196-keymap_changed (GdkKeymap *map)
197+keymap_changed (GdkKeymap *map G_GNUC_UNUSED)
198 {
199 GdkKeymap *keymap = gdk_keymap_get_default ();
200 GSList *iter;

Subscribers

People subscribed via source and target branches

to status/vote changes: