[gtk+] inspector: Fix various compiler warnings



commit c88c16d1f481fcd98297920250415a1116fbc490
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Sep 5 20:52:03 2014 -0400

    inspector: Fix various compiler warnings
    
    Mostly missing declarations and missing statics.

 gtk/inspector/action-editor.c  |    2 +-
 gtk/inspector/init.c           |    2 ++
 gtk/inspector/inspect-button.c |    4 ++--
 gtk/inspector/prop-editor.c    |    4 ++--
 gtk/inspector/size-groups.c    |    2 ++
 gtk/inspector/visual.c         |    2 +-
 gtk/inspector/window.c         |    4 +---
 gtk/inspector/window.h         |    3 +++
 8 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/gtk/inspector/action-editor.c b/gtk/inspector/action-editor.c
index cfc0412..d1fb992 100644
--- a/gtk/inspector/action-editor.c
+++ b/gtk/inspector/action-editor.c
@@ -164,7 +164,7 @@ variant_editor_set_value (GtkWidget *editor,
   g_signal_handlers_unblock_by_func (editor, variant_editor_changed_cb, data);
 }
 
-GVariant *
+static GVariant *
 variant_editor_get_value (GtkWidget *editor)
 {
   const GVariantType *type;
diff --git a/gtk/inspector/init.c b/gtk/inspector/init.c
index ada924a..68d3149 100644
--- a/gtk/inspector/init.c
+++ b/gtk/inspector/init.c
@@ -22,6 +22,8 @@
  */
 #include <glib.h>
 
+#include "init.h"
+
 #include "actions.h"
 #include "button-path.h"
 #include "classes-list.h"
diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c
index ce89bfe..1c3135f 100644
--- a/gtk/inspector/inspect-button.c
+++ b/gtk/inspector/inspect-button.c
@@ -305,8 +305,8 @@ property_query_event (GtkWidget *widget,
 }
 
 void
-on_inspect (GtkWidget          *button,
-            GtkInspectorWindow *iw)
+gtk_inspector_on_inspect (GtkWidget          *button,
+                          GtkInspectorWindow *iw)
 {
   GdkDisplay *display;
   GdkDevice *device;
diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c
index 3b19e81..103434d 100644
--- a/gtk/inspector/prop-editor.c
+++ b/gtk/inspector/prop-editor.c
@@ -1081,7 +1081,7 @@ gtk_inspector_prop_editor_init (GtkInspectorPropEditor *editor)
                 NULL);
 }
 
-GtkTreeModel *
+static GtkTreeModel *
 gtk_cell_layout_get_model (GtkCellLayout *layout)
 {
   if (GTK_IS_TREE_VIEW_COLUMN (layout))
@@ -1094,7 +1094,7 @@ gtk_cell_layout_get_model (GtkCellLayout *layout)
     return NULL;
 }
 
-GtkWidget *
+static GtkWidget *
 gtk_cell_layout_get_widget (GtkCellLayout *layout)
 {
   if (GTK_IS_TREE_VIEW_COLUMN (layout))
diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c
index 422007c..69d26a2 100644
--- a/gtk/inspector/size-groups.c
+++ b/gtk/inspector/size-groups.c
@@ -46,6 +46,8 @@ enum {
 
 GParamSpec *properties[LAST_PROPERTY] = { NULL };
 
+GType size_group_row_get_type (void);
+
 G_DEFINE_TYPE (SizeGroupRow, size_group_row, GTK_TYPE_LIST_BOX_ROW)
 
 static void
diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c
index ab11cfa..a86c997 100644
--- a/gtk/inspector/visual.c
+++ b/gtk/inspector/visual.c
@@ -117,7 +117,7 @@ redraw_everything (void)
   g_list_free (toplevels);
 }
 
-void
+static void
 updates_activate (GtkSwitch *sw)
 {
   gdk_window_set_debug_updates (gtk_switch_get_active (sw));
diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c
index efd510d..9957128 100644
--- a/gtk/inspector/window.c
+++ b/gtk/inspector/window.c
@@ -50,8 +50,6 @@
 
 G_DEFINE_TYPE (GtkInspectorWindow, gtk_inspector_window, GTK_TYPE_WINDOW)
 
-extern void on_inspect (GtkWidget *button, GtkInspectorWindow *iw);
-
 static gboolean
 on_widget_tree_button_press (GtkInspectorWidgetTree *wt,
                              GdkEventButton         *event,
@@ -215,7 +213,7 @@ gtk_inspector_window_class_init (GtkInspectorWindowClass *klass)
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, misc_info);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, gestures);
 
-  gtk_widget_class_bind_template_callback (widget_class, on_inspect);
+  gtk_widget_class_bind_template_callback (widget_class, gtk_inspector_on_inspect);
   gtk_widget_class_bind_template_callback (widget_class, on_widget_tree_selection_changed);
   gtk_widget_class_bind_template_callback (widget_class, on_send_widget_to_shell_activate);
 }
diff --git a/gtk/inspector/window.h b/gtk/inspector/window.h
index b8f8b71..a9096b2 100644
--- a/gtk/inspector/window.h
+++ b/gtk/inspector/window.h
@@ -85,6 +85,9 @@ void       gtk_inspector_flash_widget       (GtkInspectorWindow *iw,
 void       gtk_inspector_start_highlight    (GtkWidget          *widget);
 void       gtk_inspector_stop_highlight     (GtkWidget          *widget);
 
+void       gtk_inspector_on_inspect         (GtkWidget          *widget,
+                                             GtkInspectorWindow *iw);
+
 void       gtk_inspector_window_select_widget_under_pointer (GtkInspectorWindow *iw);
 
                                             


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]