ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Kevin Turner <http://keturn.net/>
Related merge proposals:
  https://code.launchpad.net/~keturn/indicator-applet/cleanup-gcc-warnings/+merge/23579
  proposed by: Kevin Turner (keturn)
  review: Approve - Ted Gould (ted)
------------------------------------------------------------
revno: 353 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: applet
timestamp: Fri 2010-04-16 16:46:10 -0500
message:
  Compiler cleanups from Kevin Turner
modified:
  .bzrignore
  src/applet-main.c
  src/tomboykeybinder.c


--
lp:indicator-applet
https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet

Your team ayatana-commits is subscribed to branch lp:indicator-applet.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet/+edit-subscription

=== modified file '.bzrignore'
--- .bzrignore	2010-01-04 19:26:05 +0000
+++ .bzrignore	2010-04-16 18:59:21 +0000
@@ -107,3 +107,33 @@
 src/indicator-applet-complete
 src/indicator-applet-session
 data/GNOME_IndicatorAppletComplete.server
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+stamp-h1
+data/GNOME_FastUserSwitchApplet.server
+data/Makefile
+data/Makefile.in
+po/.intltool-merge-cache
+po/Makefile
+po/Makefile.in
+po/Makefile.in.in
+po/POTFILES
+po/stamp-it
+src/Makefile
+src/Makefile.in

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2010-04-02 15:23:20 +0000
+++ src/applet-main.c	2010-04-16 19:56:30 +0000
@@ -26,7 +26,7 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "libindicator/indicator-object.h"
-
+#include "tomboykeybinder.h"
 
 static gchar * indicator_order[] = {
 	"libapplication.so",
@@ -231,7 +231,8 @@
 }
 
 static void
-entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data)
+entry_removed (IndicatorObject * io G_GNUC_UNUSED, IndicatorObjectEntry * entry,
+               gpointer user_data)
 {
 	g_debug("Signal: Entry Removed");
 
@@ -260,7 +261,8 @@
 
 /* Gets called when an entry for an object was moved. */
 static void
-entry_moved (IndicatorObject * io, IndicatorObjectEntry * entry, gint old, gint new, gpointer user_data)
+entry_moved (IndicatorObject * io, IndicatorObjectEntry * entry,
+             gint old G_GNUC_UNUSED, gint new G_GNUC_UNUSED, gpointer user_data)
 {
 	GtkWidget * menu = GTK_WIDGET(user_data);
 
@@ -332,7 +334,7 @@
 }
 
 static void
-hotkey_filter (char * keystring, gpointer data)
+hotkey_filter (char * keystring G_GNUC_UNUSED, gpointer data)
 {
 	g_return_if_fail(GTK_IS_MENU_SHELL(data));
 
@@ -357,7 +359,7 @@
 static gboolean
 menubar_press (GtkWidget * widget,
                     GdkEventButton *event,
-                    gpointer data)
+                    gpointer data G_GNUC_UNUSED)
 {
 	if (event->button != 1) {
 		g_signal_stop_emission_by_name(widget, "button-press-event");
@@ -367,22 +369,23 @@
 }
 
 static gboolean
-menubar_scroll (GtkWidget      *widget,
+menubar_scroll (GtkWidget      *widget G_GNUC_UNUSED,
                 GdkEventScroll *event,
-                gpointer        data)
+                gpointer        data G_GNUC_UNUSED)
 {
   GtkWidget *menuitem;
-  GtkWidget *parent;
 
   menuitem = gtk_get_event_widget ((GdkEvent *)event);
 
   IndicatorObject *io = g_object_get_data (G_OBJECT (menuitem), "indicator");
   g_signal_emit_by_name (io, "scroll", 1, event->direction);
+
+  return FALSE;
 }
 
 static gboolean
 menubar_on_expose (GtkWidget * widget,
-                    GdkEventExpose *event,
+                    GdkEventExpose *event G_GNUC_UNUSED,
                     GtkWidget * menubar)
 {
 	if (GTK_WIDGET_HAS_FOCUS(menubar))
@@ -393,9 +396,9 @@
 }
 
 static void
-about_cb (BonoboUIComponent *ui_container,
-	  gpointer           data,
-	  const gchar       *cname)
+about_cb (BonoboUIComponent *ui_container G_GNUC_UNUSED,
+	  gpointer           data G_GNUC_UNUSED,
+	  const gchar       *cname G_GNUC_UNUSED)
 {
 	static const gchar *authors[] = {
 		"Ted Gould <ted@xxxxxxxxxxxxx>",
@@ -448,14 +451,18 @@
 #define N_(x) x
 
 static void
-log_to_file_cb (GObject * source_obj, GAsyncResult * result, gpointer user_data)
+log_to_file_cb (GObject * source_obj G_GNUC_UNUSED,
+                GAsyncResult * result G_GNUC_UNUSED, gpointer user_data)
 {
 	g_free(user_data);
 	return;
 }
 
 static void
-log_to_file (const gchar * domain, GLogLevelFlags level, const gchar * message, gpointer data)
+log_to_file (const gchar * domain G_GNUC_UNUSED,
+             GLogLevelFlags level G_GNUC_UNUSED,
+             const gchar * message,
+             gpointer data G_GNUC_UNUSED)
 {
 	if (log_file == NULL) {
 		GError * error = NULL;
@@ -500,7 +507,8 @@
 }
 
 static gboolean
-applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data)
+applet_fill_cb (PanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
+                gpointer data G_GNUC_UNUSED)
 {
 	static const BonoboUIVerb menu_verbs[] = {
 		BONOBO_UI_VERB ("IndicatorAppletAbout", about_cb),
@@ -512,7 +520,6 @@
 		"</popup>";
 
 	GtkWidget *menubar;
-	gint i;
 	gint indicators_loaded = 0;
 	static gboolean first_time = FALSE;
 

=== modified file 'src/tomboykeybinder.c'
--- src/tomboykeybinder.c	2010-03-02 22:24:00 +0000
+++ src/tomboykeybinder.c	2010-04-16 19:56:30 +0000
@@ -79,7 +79,7 @@
 		caps_lock_mask | scroll_lock_mask,
 		num_lock_mask  | caps_lock_mask | scroll_lock_mask,
 	};
-	int i;
+	guint i;
 
 	for (i = 0; i < G_N_ELEMENTS (mod_masks); i++) {
 		if (grab) {
@@ -162,7 +162,8 @@
 }
 
 static GdkFilterReturn
-filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
+filter_func (GdkXEvent *gdk_xevent, GdkEvent *event G_GNUC_UNUSED,
+             gpointer data G_GNUC_UNUSED)
 {
 	GdkFilterReturn return_val = GDK_FILTER_CONTINUE;
 	XEvent *xevent = (XEvent *) gdk_xevent;
@@ -213,7 +214,7 @@
 }
 
 static void 
-keymap_changed (GdkKeymap *map)
+keymap_changed (GdkKeymap *map G_GNUC_UNUSED)
 {
 	GdkKeymap *keymap = gdk_keymap_get_default ();
 	GSList *iter;