[GnomeMeeting-devel-list] [PATCH] compilation warnings

[PUYDT Julien <julien puydt laposte net>]

Hi,

the recent cleaning of configure led to the compilation of the lib/
directory with g++ instead of gcc, and hence made the compilation a
little more verbose in stderr...

This patch fixes those new warnings (I don't want to touch to xdap.c!).

Snark

diff -ur gnomemeeting-cvs-20040129.CVS/lib/dialog.c gnomemeeting-cvs-20040129.CVS.patched/lib/dialog.c
--- gnomemeeting-cvs-20040129.CVS/lib/dialog.c	2003-12-28 18:55:08.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/dialog.c	2004-01-29 18:10:03.000000000 +0100
@@ -88,6 +88,8 @@
 			 GTK_MESSAGE_ERROR);
   
   va_end (args);
+
+  return dialog;
 }
 
 
@@ -137,7 +139,6 @@
 			     gint i,
 			     gpointer data)
 {
-  GtkWidget *button = NULL;
   GList *children = NULL;
   
   children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (w)->vbox));
@@ -177,8 +178,8 @@
   
   va_start (args, format);
   
-  g_return_if_fail (parent != NULL);
-  g_return_if_fail (key != NULL);
+  g_return_val_if_fail (parent != NULL, NULL);
+  g_return_val_if_fail (key != NULL, NULL);
 
      
   /* if not set, do_not_show will get the value of 0 */
@@ -186,7 +187,7 @@
   
   if (do_not_show)
     /* doesn't show warning dialog as state is 'hide' */
-    return;
+    return NULL;
  
   button = 
     gtk_check_button_new_with_label (_("Do not show this dialog again"));
diff -ur gnomemeeting-cvs-20040129.CVS/lib/gconf_widgets_extensions.c gnomemeeting-cvs-20040129.CVS.patched/lib/gconf_widgets_extensions.c
--- gnomemeeting-cvs-20040129.CVS/lib/gconf_widgets_extensions.c	2004-01-20 12:00:34.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/gconf_widgets_extensions.c	2004-01-29 18:26:49.000000000 +0100
@@ -84,8 +84,7 @@
 {
   GtkWidget *e = NULL;
   gchar *current_value = NULL;
-  gulong sid = 0;
-  
+
   if (entry->value->type == GCONF_VALUE_STRING) {
 
     gdk_threads_enter ();
diff -ur gnomemeeting-cvs-20040129.CVS/lib/gconf_widgets_extensions.h gnomemeeting-cvs-20040129.CVS.patched/lib/gconf_widgets_extensions.h
--- gnomemeeting-cvs-20040129.CVS/lib/gconf_widgets_extensions.h	2004-01-20 12:00:34.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/gconf_widgets_extensions.h	2004-01-29 18:26:22.000000000 +0100
@@ -38,7 +38,7 @@
 
 #include <gconf/gconf-client.h>
 #include <gtk/gtk.h>
-
+#include <string.h>
 
 G_BEGIN_DECLS
 
diff -ur gnomemeeting-cvs-20040129.CVS/lib/gnome_prefs_window.c gnomemeeting-cvs-20040129.CVS.patched/lib/gnome_prefs_window.c
--- gnomemeeting-cvs-20040129.CVS/lib/gnome_prefs_window.c	2004-01-20 12:00:34.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/gnome_prefs_window.c	2004-01-29 18:35:57.000000000 +0100
@@ -71,7 +71,6 @@
   int page = 0;
   gchar *name = NULL;
   GtkTreeIter iter;
-  GtkWidget *label = NULL;
   GtkTreeModel *model = NULL;
   GnomePrefsWindow *gpw = NULL;
 
@@ -898,12 +897,12 @@
   GtkTreeIter child_iter;
     
   if (!window)
-    return;
+    return NULL;
   
   gpw = (GnomePrefsWindow *) g_object_get_data (G_OBJECT (window), "gpw");
 
   if (!gpw || !section_name)
-    return;
+    return NULL;
 
   container = gtk_vbox_new (FALSE, 4);
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (gpw->sections_tree_view));
diff -ur gnomemeeting-cvs-20040129.CVS/lib/gnome_prefs_window.h gnomemeeting-cvs-20040129.CVS.patched/lib/gnome_prefs_window.h
--- gnomemeeting-cvs-20040129.CVS/lib/gnome_prefs_window.h	2004-01-20 12:00:34.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/gnome_prefs_window.h	2004-01-29 18:35:03.000000000 +0100
@@ -37,7 +37,7 @@
 
 #include <gconf/gconf-client.h>
 #include <gtk/gtk.h>
-
+#include <string.h>
 
 G_BEGIN_DECLS
 
diff -ur gnomemeeting-cvs-20040129.CVS/lib/gtk_menu_extensions.c gnomemeeting-cvs-20040129.CVS.patched/lib/gtk_menu_extensions.c
--- gnomemeeting-cvs-20040129.CVS/lib/gtk_menu_extensions.c	2004-01-20 12:00:34.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/gtk_menu_extensions.c	2004-01-29 18:25:57.000000000 +0100
@@ -294,13 +294,14 @@
 			     menu [i].widget);      
 
     
-    if (menu [i].id)
+    if (menu [i].id) {
       if (menu [i].type != MENU_SUBMENU_NEW)
 	g_object_set_data (G_OBJECT (menubar), menu [i].id,
 			   menu [i].widget);
       else
 	g_object_set_data (G_OBJECT (menubar), menu [i].id,
 			   menu_widget);
+    }
       
     if (!menu [i].sensitive)
       gtk_widget_set_sensitive (GTK_WIDGET (menu [i].widget), FALSE);
diff -ur gnomemeeting-cvs-20040129.CVS/lib/gtk-text-buffer-addon.c gnomemeeting-cvs-20040129.CVS.patched/lib/gtk-text-buffer-addon.c
--- gnomemeeting-cvs-20040129.CVS/lib/gtk-text-buffer-addon.c	2004-01-20 19:00:02.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/gtk-text-buffer-addon.c	2004-01-29 20:39:25.000000000 +0100
@@ -202,7 +202,7 @@
     {"|(", gm_emoticon_sad_glasses},
     {"|-(", gm_emoticon_sad_nose_glasses},
     {"|-)", gm_emoticon_happy_nose_glasses},
-    NULL
+    { NULL }
   };
 
 /**
diff -ur gnomemeeting-cvs-20040129.CVS/lib/gtk-text-buffer-addon.h gnomemeeting-cvs-20040129.CVS.patched/lib/gtk-text-buffer-addon.h
--- gnomemeeting-cvs-20040129.CVS/lib/gtk-text-buffer-addon.h	2004-01-20 12:00:34.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/gtk-text-buffer-addon.h	2004-01-29 18:21:59.000000000 +0100
@@ -39,6 +39,7 @@
 
 
 #include <gtk/gtk.h>
+#include <string.h>
 
 #ifndef __GTK_TEXT_BUF_ADD_H
 #define __GTK_TEXT_BUF_ADD_H
diff -ur gnomemeeting-cvs-20040129.CVS/lib/widgets/gmentrydialog.c gnomemeeting-cvs-20040129.CVS.patched/lib/widgets/gmentrydialog.c
--- gnomemeeting-cvs-20040129.CVS/lib/widgets/gmentrydialog.c	2004-01-28 11:13:15.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/widgets/gmentrydialog.c	2004-01-29 18:11:24.000000000 +0100
@@ -148,7 +148,7 @@
 const char *
 gm_entry_dialog_get_text (GmEntryDialog *ed)
 {
-  g_return_if_fail (ed != NULL);
+  g_return_val_if_fail (ed != NULL, NULL);
 
   return gtk_entry_get_text (GTK_ENTRY (ed->field_entry));
 }
diff -ur gnomemeeting-cvs-20040129.CVS/lib/widgets/gtklevelmeter.h gnomemeeting-cvs-20040129.CVS.patched/lib/widgets/gtklevelmeter.h
--- gnomemeeting-cvs-20040129.CVS/lib/widgets/gtklevelmeter.h	2004-01-08 23:34:02.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/widgets/gtklevelmeter.h	2004-01-29 18:12:42.000000000 +0100
@@ -41,7 +41,7 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
-
+#include <stdlib.h>
 
 G_BEGIN_DECLS
 
diff -ur gnomemeeting-cvs-20040129.CVS/lib/widgets/history-combo.c gnomemeeting-cvs-20040129.CVS.patched/lib/widgets/history-combo.c
--- gnomemeeting-cvs-20040129.CVS/lib/widgets/history-combo.c	2004-01-08 23:34:02.000000000 +0100
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/widgets/history-combo.c	2004-01-29 18:16:35.000000000 +0100
@@ -99,7 +99,6 @@
 gm_history_combo_class_init (GmHistoryComboClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GmHistoryComboClass *combo_class = GM_HISTORY_COMBO_CLASS (klass);
   
   parent_class = g_type_class_peek_parent (klass);
   
@@ -132,8 +131,6 @@
   GConfClient *client;
   
   GSList *contact_gconf;
-  GSList *iter;
-  GList  *contact_list = NULL;
   const char *key;
 
   g_object_get (G_OBJECT (combo), "key", &key, NULL);
@@ -290,11 +287,8 @@
                             const char *new_entry)
 {
   GConfClient  *client;
-  GList        *contact_list;
   GSList       *contact_gconf;
   GList        *iter;
-  GList        *item;
-  GList        *last_item;
   char         *entry_content;
   unsigned int  max_entries;
   
diff -ur gnomemeeting-cvs-20040129.CVS/lib/widgets/history-combo.h gnomemeeting-cvs-20040129.CVS.patched/lib/widgets/history-combo.h
--- gnomemeeting-cvs-20040129.CVS/lib/widgets/history-combo.h	2003-04-08 23:40:50.000000000 +0200
+++ gnomemeeting-cvs-20040129.CVS.patched/lib/widgets/history-combo.h	2004-01-29 18:15:13.000000000 +0100
@@ -39,6 +39,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
+#include <string.h>
 #ifndef DISABLE_GCONF
 #include <gconf/gconf-client.h>
 #else