libmbca r28 - trunk/src

[kaijanma svn gnome org]

Author: kaijanma
Date: Wed Aug 20 08:54:45 2008
New Revision: 28
URL: http://svn.gnome.org/viewvc/libmbca?rev=28&view=rev

Log:
fix build warnings

Modified:
   trunk/src/bluetooth_page.c
   trunk/src/callbacks.h
   trunk/src/hal_page.c
   trunk/src/mbca_assistant.c
   trunk/src/method_page.c
   trunk/src/provider_page.c
   trunk/src/provider_thread.c
   trunk/src/serial_page.c
   trunk/src/serviceprovider_parser.c
   trunk/src/summary_page.c

Modified: trunk/src/bluetooth_page.c
==============================================================================
--- trunk/src/bluetooth_page.c	(original)
+++ trunk/src/bluetooth_page.c	Wed Aug 20 08:54:45 2008
@@ -23,9 +23,9 @@
 #include "callbacks.h"
 
 void
-mbca_bluetooth_page_prepare_cb (GtkAssistant* gtkassistant,
-						  GtkWidget* page,
-						  gpointer user_data)
+mbca_bluetooth_page_prepare_cb (GtkAssistant* gtkassistant __attribute__((unused)),
+						  GtkWidget* page __attribute__((unused)),
+						  gpointer user_data __attribute__((unused)))
 {
 	/* bluetooth rescan is controlled in mbca_assistant_prepare_cb() */
 }

Modified: trunk/src/callbacks.h
==============================================================================
--- trunk/src/callbacks.h	(original)
+++ trunk/src/callbacks.h	Wed Aug 20 08:54:45 2008
@@ -160,7 +160,6 @@
 							 gboolean keyboard_mode,
 							 GtkTooltip* tooltip,
 							 gpointer userdata);
-
 gpointer
 mbca_construct_provider_page_cb (gpointer data);
 

Modified: trunk/src/hal_page.c
==============================================================================
--- trunk/src/hal_page.c	(original)
+++ trunk/src/hal_page.c	Wed Aug 20 08:54:45 2008
@@ -27,8 +27,8 @@
  */
 
 void
-mbca_hal_page_prepare_cb (GtkAssistant* gtkassistant,
-					 GtkWidget* page,
+mbca_hal_page_prepare_cb (GtkAssistant* gtkassistant __attribute__((unused)),
+					 GtkWidget* page __attribute__((unused)),
 					 gpointer user_data)
 {
 	MBCAAssistant* assistant = user_data;

Modified: trunk/src/mbca_assistant.c
==============================================================================
--- trunk/src/mbca_assistant.c	(original)
+++ trunk/src/mbca_assistant.c	Wed Aug 20 08:54:45 2008
@@ -663,9 +663,10 @@
  * GObject *
  ***********/
 
+__attribute__ ((unused)) /** @todo use me, see mbca_assistant_get_type() */
 static void
 assistant_class_finalize (gpointer g_class,
-					 gpointer class_data)
+					 gpointer class_data __attribute__((unused)))
 {
 	MBCAAssistantClassPrivate* priv;
 	GtkTreeModel* country_store;
@@ -722,7 +723,7 @@
 }
 
 static void
-assistant_dispose (GObject *obj)
+assistant_dispose (GObject *obj __attribute__((unused)))
 {
 	g_debug ("assistant_dispose");
 #if 0
@@ -800,7 +801,7 @@
 
 static void
 assistant_class_init (gpointer g_class,
-                      gpointer g_class_data)
+                      gpointer g_class_data __attribute__((unused)))
 {
 	MBCAAssistantClassPrivate* priv;
 	GObjectClass* gobject_class;
@@ -1159,7 +1160,8 @@
 			NULL,   /* class_data */
 			sizeof (MBCAAssistant),
 			0,      /* n_preallocs */
-			assistant_init
+			assistant_init,
+			NULL    /* value_table */
 		};
 		type = g_type_register_static (G_TYPE_OBJECT,
 								 "MBCAAssistantType",
@@ -1315,7 +1317,7 @@
  ***********************/
 
 void
-mbca_assistant_apply_cb (GtkAssistant* gtkassistant,
+mbca_assistant_apply_cb (GtkAssistant* gtkassistant __attribute__ ((unused)),
 					gpointer user_data)
 {
 	MBCAAssistant* assistant = user_data;
@@ -1341,7 +1343,7 @@
 }
 
 void
-mbca_assistant_close_cb (GtkButton* button,
+mbca_assistant_close_cb (GtkButton* button __attribute__ ((unused)),
 					gpointer user_data)
 {
 	MBCAAssistant* assistant = user_data;

Modified: trunk/src/method_page.c
==============================================================================
--- trunk/src/method_page.c	(original)
+++ trunk/src/method_page.c	Wed Aug 20 08:54:45 2008
@@ -82,15 +82,15 @@
 }
 
 void
-mbca_method_page_prepare_cb (GtkAssistant* gtkassistant,
-					    GtkWidget* page,
-					    gpointer user_data)
+mbca_method_page_prepare_cb (GtkAssistant* gtkassistant __attribute__ ((unused)),
+					    GtkWidget* page __attribute__ ((unused)),
+					    gpointer user_data __attribute__ ((unused)))
 {
 	
 }
 
 void
-mbca_bluetooth_radiobutton_clicked_cb (GtkButton* button,
+mbca_bluetooth_radiobutton_clicked_cb (GtkButton* button __attribute__ ((unused)),
 							    gpointer user_data)
 {
 	MBCAAssistantPrivate* priv = user_data;
@@ -109,7 +109,7 @@
 }
 
 void
-mbca_builtin_radiobutton_clicked_cb (GtkButton* button,
+mbca_builtin_radiobutton_clicked_cb (GtkButton* button __attribute__ ((unused)),
 							  gpointer user_data)
 {
 	set_hal_device (_("Built-in"),
@@ -121,7 +121,7 @@
 }
 
 void
-mbca_pcmcia_radiobutton_clicked_cb (GtkButton* button,
+mbca_pcmcia_radiobutton_clicked_cb (GtkButton* button __attribute__ ((unused)),
 							 gpointer user_data)
 {
 	set_hal_device (_("PC Card, PCMCIA, or ExpressCard"),
@@ -131,7 +131,7 @@
 }
 
 void
-mbca_serialcable_radiobutton_clicked_cb (GtkButton* button,
+mbca_serialcable_radiobutton_clicked_cb (GtkButton* button __attribute__ ((unused)),
 								 gpointer user_data)
 {
 	MBCAAssistantPrivate* priv = user_data;
@@ -144,7 +144,7 @@
 }
 
 void
-mbca_usb_radiobutton_clicked_cb (GtkButton* button,
+mbca_usb_radiobutton_clicked_cb (GtkButton* button __attribute__ ((unused)),
 						   gpointer user_data)
 {
 	set_hal_device (_("USB"),

Modified: trunk/src/provider_page.c
==============================================================================
--- trunk/src/provider_page.c	(original)
+++ trunk/src/provider_page.c	Wed Aug 20 08:54:45 2008
@@ -26,12 +26,15 @@
  */
 
 #include "callbacks.h"
+#include "provider_thread.h" /** @todo remove, this is for thread bug
+						*        workaround
+						*/
 
 #include <string.h> /* memmove */
 
 void
-mbca_provider_page_prepare_cb (GtkAssistant* gtkassistant,
-					      GtkWidget* page,
+mbca_provider_page_prepare_cb (GtkAssistant* gtkassistant __attribute__ ((unused)),
+					      GtkWidget* page __attribute__ ((unused)),
 					      gpointer user_data)
 {
 	MBCAAssistant* assistant = user_data;
@@ -145,9 +148,9 @@
 mbca_country_code_qyery_tooltip_cb (GtkWidget* widget,
 							 gint x,
 							 gint y,
-							 gboolean keyboard_mode,
+							 gboolean keyboard_mode __attribute__ ((unused)),
 							 GtkTooltip* tooltip,
-							 gpointer userdata)
+							 gpointer userdata __attribute__ ((unused)))
 {
 	GtkTreeView* country_list = GTK_TREE_VIEW (widget);
 	GtkTreeViewColumn* column;

Modified: trunk/src/provider_thread.c
==============================================================================
--- trunk/src/provider_thread.c	(original)
+++ trunk/src/provider_thread.c	Wed Aug 20 08:54:45 2008
@@ -599,7 +599,6 @@
 {
 	MBCAAssistantClassPrivate* priv = data;
 	const gchar* code;
-	GSList* iter;
 	gint ret;
 
 	/**
@@ -648,6 +647,8 @@
 
 	/** @todo fixme */
 #if 0
+	GSList* iter;
+	
 	/* time for some attaching */
 	g_debug ("attaching resources to waiting instances");
 	g_mutex_lock (priv->instances_mutex);
@@ -676,7 +677,6 @@
 	GtkTreeViewColumn* column;
 	GtkWidget* country_list;
 	GtkExpander* expander;
-	GdkCursor* cursor;
 	GtkWidget* page;
 	gboolean found;
 	

Modified: trunk/src/serial_page.c
==============================================================================
--- trunk/src/serial_page.c	(original)
+++ trunk/src/serial_page.c	Wed Aug 20 08:54:45 2008
@@ -28,9 +28,9 @@
 #include "callbacks.h"
 
 void
-mbca_serial_page_prepare_cb (GtkAssistant* gtkassistant,
-					    GtkWidget* page,
-					    gpointer user_data)
+mbca_serial_page_prepare_cb (GtkAssistant* gtkassistant __attribute__ ((unused)),
+					    GtkWidget* page __attribute__ ((unused)),
+					    gpointer user_data __attribute__ ((unused)))
 {
 	
 }

Modified: trunk/src/serviceprovider_parser.c
==============================================================================
--- trunk/src/serviceprovider_parser.c	(original)
+++ trunk/src/serviceprovider_parser.c	Wed Aug 20 08:54:45 2008
@@ -28,6 +28,7 @@
  */
 
 #include "serviceprovider_parser.h"
+#include "mbca_serviceprovider_private.h"
 
 #include <libxml/xmlreader.h>
 #include <string.h>			/* memset */

Modified: trunk/src/summary_page.c
==============================================================================
--- trunk/src/summary_page.c	(original)
+++ trunk/src/summary_page.c	Wed Aug 20 08:54:45 2008
@@ -42,8 +42,8 @@
 }
 
 void
-mbca_summary_page_prepare_cb (GtkAssistant* gtkassistant,
-						GtkWidget* page,
+mbca_summary_page_prepare_cb (GtkAssistant* gtkassistant __attribute__ ((unused)),
+						GtkWidget* page __attribute__ ((unused)),
 						gpointer user_data)
 {
 	MBCAAssistant* assistant = user_data;