GNOME.org
 

[niepce: 3/5] * Kill some warnings in libgdl.

commit 47f5750b05b122b1fd2e1475f3c9bf4576a57b67
Author: Hubert Figuiere <hub figuiere net>
Date:   Thu Mar 5 20:48:56 2009 -0500

    	* Kill some warnings in libgdl.
---
 ChangeLog                             |    4 ++++
 src/ext/libgdl/gdl-dock-item-grip.c   |    4 ++--
 src/ext/libgdl/gdl-dock-item.c        |    2 +-
 src/ext/libgdl/gdl-dock-master.c      |   14 ++++++--------
 src/ext/libgdl/gdl-dock-notebook.c    |    2 +-
 src/ext/libgdl/gdl-dock-object.h      |    4 ++--
 src/ext/libgdl/gdl-dock-paned.c       |    5 +++--
 src/ext/libgdl/gdl-dock-placeholder.c |    2 +-
 src/ext/libgdl/gdl-dock-tablabel.c    |    2 +-
 src/ext/libgdl/gdl-dock.c             |    4 ++--
 src/ext/libgdl/gdl-stock.h            |    2 +-
 src/ext/libgdl/gdl-switcher.c         |    7 ++++---
 src/ext/libgdl/gdl-tools.h            |    4 ++--
 13 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b4f64e..d51b057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-05  Hubert Figuiere  <hub figuiere net>
+
+	* Kill some warnings in libgdl.
+
 2009-03-04  Hubert Figuiere  <hub figuiere net>
 
 	* Remove glade to use GtkBuilder. Rename a few headers.
diff --git a/src/ext/libgdl/gdl-dock-item-grip.c b/src/ext/libgdl/gdl-dock-item-grip.c
index 51d1f6f..8ff6d8f 100644
--- a/src/ext/libgdl/gdl-dock-item-grip.c
+++ b/src/ext/libgdl/gdl-dock-item-grip.c
@@ -45,7 +45,7 @@ struct _GdlDockItemGripPrivate {
 };
  
 GDL_CLASS_BOILERPLATE (GdlDockItemGrip, gdl_dock_item_grip,
-		       GtkContainer, GTK_TYPE_CONTAINER);
+		       GtkContainer, GTK_TYPE_CONTAINER)
 
 /* must be called after size_allocate */
 static void
@@ -135,7 +135,7 @@ gdl_dock_item_grip_expose (GtkWidget      *widget,
     gint             layout_height;
     gint             text_x;
     gint             text_y;
-    gboolean         item_or_child_has_focus;
+/*    gboolean         item_or_child_has_focus;*/
 
     grip = GDL_DOCK_ITEM_GRIP (widget);
     gdl_dock_item_grip_get_title_area (grip, &title_area);
diff --git a/src/ext/libgdl/gdl-dock-item.c b/src/ext/libgdl/gdl-dock-item.c
index 01a777b..fed7040 100644
--- a/src/ext/libgdl/gdl-dock-item.c
+++ b/src/ext/libgdl/gdl-dock-item.c
@@ -197,7 +197,7 @@ struct _GdlDockItemPrivate {
 
 /* ----- Private functions ----- */
 
-GDL_CLASS_BOILERPLATE (GdlDockItem, gdl_dock_item, GdlDockObject, GDL_TYPE_DOCK_OBJECT);
+GDL_CLASS_BOILERPLATE (GdlDockItem, gdl_dock_item, GdlDockObject, GDL_TYPE_DOCK_OBJECT)
 
 static void
 add_tab_bindings (GtkBindingSet    *binding_set,
diff --git a/src/ext/libgdl/gdl-dock-master.c b/src/ext/libgdl/gdl-dock-master.c
index 1c362ed..03e1b3e 100644
--- a/src/ext/libgdl/gdl-dock-master.c
+++ b/src/ext/libgdl/gdl-dock-master.c
@@ -126,7 +126,7 @@ static guint master_signals [LAST_SIGNAL] = { 0 };
 
 /* ----- Private interface ----- */
 
-GDL_CLASS_BOILERPLATE (GdlDockMaster, gdl_dock_master, GObject, G_TYPE_OBJECT);
+GDL_CLASS_BOILERPLATE (GdlDockMaster, gdl_dock_master, GObject, G_TYPE_OBJECT)
 
 static void
 gdl_dock_master_class_init (GdlDockMasterClass *klass)
@@ -609,11 +609,11 @@ _gdl_dock_master_foreach (gpointer key,
                           gpointer value,
                           gpointer user_data)
 {
-    (void)key;
     struct {
         GFunc    function;
         gpointer user_data;
     } *data = user_data;
+    (void)key;
 
     (* data->function) (GTK_WIDGET (value), data->user_data);
 }
@@ -624,6 +624,7 @@ gdl_dock_master_xor_rect (GdlDockMaster *master)
     gint8         dash_list [2];
     GdkWindow    *window;
     GdkRectangle *rect;
+    GdkLineStyle lineStyle = GDK_LINE_ON_OFF_DASH;
     
     if (!master->_priv || !master->_priv->drag_request)
         return;
@@ -649,16 +650,13 @@ gdl_dock_master_xor_rect (GdlDockMaster *master)
     };
 
 #ifdef WIN32    
-    GdkLineStyle lineStyle = GDK_LINE_ON_OFF_DASH;
     if (is_os_vista())
     {
-        // On Vista the dash-line is increadibly slow to draw, it takes several minutes to draw the tracking lines
-        // With GDK_LINE_SOLID it is parts of a second
-        // No performance issue on WinXP
+        /* On Vista the dash-line is increadibly slow to draw, it takes several minutes to draw the tracking lines
+         * With GDK_LINE_SOLID it is parts of a second
+         * No performance issue on WinXP */
         lineStyle = GDK_LINE_SOLID;
     }
-#else
-    GdkLineStyle lineStyle = GDK_LINE_ON_OFF_DASH;
 #endif
     gdk_gc_set_line_attributes (master->_priv->root_xor_gc, 1,
                                 lineStyle,
diff --git a/src/ext/libgdl/gdl-dock-notebook.c b/src/ext/libgdl/gdl-dock-notebook.c
index 6fb931a..4d15254 100644
--- a/src/ext/libgdl/gdl-dock-notebook.c
+++ b/src/ext/libgdl/gdl-dock-notebook.c
@@ -90,7 +90,7 @@ enum {
 
 /* ----- Private functions ----- */
 
-GDL_CLASS_BOILERPLATE (GdlDockNotebook, gdl_dock_notebook, GdlDockItem, GDL_TYPE_DOCK_ITEM) ;
+GDL_CLASS_BOILERPLATE (GdlDockNotebook, gdl_dock_notebook, GdlDockItem, GDL_TYPE_DOCK_ITEM) 
 
 static void
 gdl_dock_notebook_class_init (GdlDockNotebookClass *klass)
diff --git a/src/ext/libgdl/gdl-dock-object.h b/src/ext/libgdl/gdl-dock-object.h
index 7b01cad..509bbfe 100644
--- a/src/ext/libgdl/gdl-dock-object.h
+++ b/src/ext/libgdl/gdl-dock-object.h
@@ -25,8 +25,8 @@
 #define __GDL_DOCK_OBJECT_H__
 
 #ifdef __GNUC__
-// we have too mark this as a system header because otherwise GCC barfs 
-// on variadic macros.
+/* we have too mark this as a system header because otherwise GCC barfs */
+/* on variadic macros. */
 #pragma GCC system_header
 #endif
 
diff --git a/src/ext/libgdl/gdl-dock-paned.c b/src/ext/libgdl/gdl-dock-paned.c
index 268a9f6..fe61c52 100644
--- a/src/ext/libgdl/gdl-dock-paned.c
+++ b/src/ext/libgdl/gdl-dock-paned.c
@@ -89,7 +89,7 @@ enum {
 
 /* ----- Private functions ----- */
 
-GDL_CLASS_BOILERPLATE (GdlDockPaned, gdl_dock_paned, GdlDockItem, GDL_TYPE_DOCK_ITEM);
+GDL_CLASS_BOILERPLATE (GdlDockPaned, gdl_dock_paned, GdlDockItem, GDL_TYPE_DOCK_ITEM)
 
 static void
 gdl_dock_paned_class_init (GdlDockPanedClass *klass)
@@ -178,11 +178,12 @@ gdl_dock_paned_resize_paned_ancestors (GdlDockPaned       *paned,
 
                      if (!GDL_IS_DOCK_OBJECT(widget->parent)) {
                          GtkRequisition requisition;
+                         gint new_height;
                          GtkAllocation allocation = paned->child1->allocation;
 
                          gtk_widget_size_request (paned->child1, &requisition);
 
-                         gint new_height =
+                         new_height =
                              (allocation.height > requisition.height && diff > 0 ?
                               allocation.height : requisition.height) + diff;
 
diff --git a/src/ext/libgdl/gdl-dock-placeholder.c b/src/ext/libgdl/gdl-dock-placeholder.c
index cd900a2..88f4c76 100644
--- a/src/ext/libgdl/gdl-dock-placeholder.c
+++ b/src/ext/libgdl/gdl-dock-placeholder.c
@@ -120,7 +120,7 @@ struct _GdlDockPlaceholderPrivate {
 /* ----- Private interface ----- */
 
 GDL_CLASS_BOILERPLATE (GdlDockPlaceholder, gdl_dock_placeholder,
-                       GdlDockObject, GDL_TYPE_DOCK_OBJECT);
+                       GdlDockObject, GDL_TYPE_DOCK_OBJECT)
 
 static void 
 gdl_dock_placeholder_class_init (GdlDockPlaceholderClass *klass)
diff --git a/src/ext/libgdl/gdl-dock-tablabel.c b/src/ext/libgdl/gdl-dock-tablabel.c
index bd75589..b24f995 100644
--- a/src/ext/libgdl/gdl-dock-tablabel.c
+++ b/src/ext/libgdl/gdl-dock-tablabel.c
@@ -94,7 +94,7 @@ static guint dock_tablabel_signals [LAST_SIGNAL] = { 0 };
 /* ----- Private interface ----- */
 
 GDL_CLASS_BOILERPLATE (GdlDockTablabel, gdl_dock_tablabel,
-                       GtkBin, GTK_TYPE_BIN);
+                       GtkBin, GTK_TYPE_BIN)
 
 static void
 gdl_dock_tablabel_class_init (GdlDockTablabelClass *klass)
diff --git a/src/ext/libgdl/gdl-dock.c b/src/ext/libgdl/gdl-dock.c
index 7c74791..e4f2187 100644
--- a/src/ext/libgdl/gdl-dock.c
+++ b/src/ext/libgdl/gdl-dock.c
@@ -147,7 +147,7 @@ static guint dock_signals [LAST_SIGNAL] = { 0 };
 
 /* ----- Private functions ----- */
 
-GDL_CLASS_BOILERPLATE (GdlDock, gdl_dock, GdlDockObject, GDL_TYPE_DOCK_OBJECT);
+GDL_CLASS_BOILERPLATE (GdlDock, gdl_dock, GdlDockObject, GDL_TYPE_DOCK_OBJECT)
 
 static void
 gdl_dock_class_init (GdlDockClass *klass)
@@ -1218,7 +1218,7 @@ gdl_dock_add_item (GdlDock          *dock,
         /* Non-floating item. */
         if (dock->root) {
             GdlDockPlacement local_placement;
-            GtkRequisition preferred_size;
+            /*GtkRequisition preferred_size;*/
             
             best_dock_item =
                 gdl_dock_find_best_placement_item (GDL_DOCK_ITEM (dock->root),
diff --git a/src/ext/libgdl/gdl-stock.h b/src/ext/libgdl/gdl-stock.h
index cb6f7ab..9046f4f 100644
--- a/src/ext/libgdl/gdl-stock.h
+++ b/src/ext/libgdl/gdl-stock.h
@@ -22,7 +22,7 @@
 #ifndef __GDL_STOCK_H__
 #define __GDL_STOCK_H__
 
-#include <glib/gmacros.h>   // G_BEGIN_DECLS
+#include <glib/gmacros.h>   /* G_BEGIN_DECLS*/
 
 G_BEGIN_DECLS
 
diff --git a/src/ext/libgdl/gdl-switcher.c b/src/ext/libgdl/gdl-switcher.c
index bfd4446..880491d 100644
--- a/src/ext/libgdl/gdl-switcher.c
+++ b/src/ext/libgdl/gdl-switcher.c
@@ -60,7 +60,7 @@ static void gdl_switcher_add_button  (GdlSwitcher *switcher,
                                       const gchar *stock_id,
                                       const GdkPixbuf *pixbuf_icon,
                                       gint switcher_id);
-static void gdl_switcher_remove_button (GdlSwitcher *switcher, gint switcher_id);
+/*static void gdl_switcher_remove_button (GdlSwitcher *switcher, gint switcher_id);*/
 static void gdl_switcher_select_page (GdlSwitcher *switcher, gint switcher_id);
 static void gdl_switcher_select_button (GdlSwitcher *switcher, gint switcher_id);
 static void gdl_switcher_set_show_buttons (GdlSwitcher *switcher, gboolean show);
@@ -524,6 +524,7 @@ gdl_switcher_expose (GtkWidget *widget, GdkEventExpose *event)
     }
     GDL_CALL_PARENT_WITH_DEFAULT (GTK_WIDGET_CLASS, expose_event,
                                   (widget, event), FALSE);
+    return 0;
 }
 
 static void
@@ -628,7 +629,6 @@ gdl_switcher_switch_page_cb (GtkNotebook *nb, GtkNotebookPage *page,
                              gint page_num, GdlSwitcher *switcher)
 {
     GtkWidget       *page_widget;
-    GtkWidget       *tablabel;
     gint             switcher_id;
     
     /* Change switcher button */
@@ -684,7 +684,6 @@ gdl_switcher_select_page (GdlSwitcher *switcher, gint id)
 static void
 gdl_switcher_class_init (GdlSwitcherClass *klass)
 {
-    GtkNotebookClass *notebook_class = GTK_NOTEBOOK_CLASS (klass);
     GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -820,6 +819,7 @@ gdl_switcher_add_button (GdlSwitcher *switcher, const gchar *label,
     gtk_widget_queue_resize (GTK_WIDGET (switcher));
 }
 
+#if 0
 static void
 gdl_switcher_remove_button (GdlSwitcher *switcher, gint switcher_id)
 {
@@ -837,6 +837,7 @@ gdl_switcher_remove_button (GdlSwitcher *switcher, gint switcher_id)
     }
     gtk_widget_queue_resize (GTK_WIDGET (switcher));
 }
+#endif
 
 static void
 gdl_switcher_select_button (GdlSwitcher *switcher, gint switcher_id)
diff --git a/src/ext/libgdl/gdl-tools.h b/src/ext/libgdl/gdl-tools.h
index 75d3ebf..5e97bf3 100644
--- a/src/ext/libgdl/gdl-tools.h
+++ b/src/ext/libgdl/gdl-tools.h
@@ -25,8 +25,8 @@
 #define __GDL_TOOLS_H__
 
 #ifdef __GNUC__
-// we have too mark this as a system header because otherwise GCC barfs 
-// on variadic macros.
+/* we have too mark this as a system header because otherwise GCC barfs */
+/* on variadic macros.*/
 #pragma GCC system_header
 #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]