/pidgin/main: d54027600e1e: gnt: Rename things consistently to f...

Changeset: d54027600e1e3f9c6c95a8ed9deeb35dc14ee407
Author:	 Elliott Sales de Andrade <[email protected]>
Date:	 2016-09-01 01:28 -0400
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/d54027600e1e

Description:

gnt: Rename things consistently to fix GIR warnings.

diffstat:

 finch/libgnt/gntbox.h    |   2 +-
 finch/libgnt/gntslider.h |   2 +-
 finch/libgnt/gnttree.h   |   4 ++--
 finch/libgnt/gntwidget.c |  14 +++++++-------
 finch/libgnt/gntwidget.h |  14 +++++++-------
 finch/libgnt/gntwindow.h |   4 ++--
 finch/libgnt/gntwm.h     |   2 +-
 finch/libgnt/gntws.h     |   2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)

diffs (133 lines):

diff --git a/finch/libgnt/gntbox.h b/finch/libgnt/gntbox.h
--- a/finch/libgnt/gntbox.h
+++ b/finch/libgnt/gntbox.h
@@ -133,7 +133,7 @@ void gnt_box_add_widget(GntBox *box, Gnt
  *
  * Since: 2.8.0
  */
-void gnt_box_add_widget_in_front(GntBox *b, GntWidget *widget);
+void gnt_box_add_widget_in_front(GntBox *box, GntWidget *widget);
 
 /**
  * gnt_box_set_title:
diff --git a/finch/libgnt/gntslider.h b/finch/libgnt/gntslider.h
--- a/finch/libgnt/gntslider.h
+++ b/finch/libgnt/gntslider.h
@@ -66,7 +66,7 @@ struct _GntSliderClass
 {
 	GntWidgetClass parent;
 
-	void (*changed)(GntSlider *slider, int);
+	void (*changed)(GntSlider *slider, int value);
 
 	/*< private >*/
 	void (*gnt_reserved1)(void);
diff --git a/finch/libgnt/gnttree.h b/finch/libgnt/gnttree.h
--- a/finch/libgnt/gnttree.h
+++ b/finch/libgnt/gnttree.h
@@ -44,8 +44,8 @@
 
 #define GNT_TYPE_TREE_ROW			(gnt_tree_row_get_type())
 
-typedef guint (*GntTreeHashFunc)(gconstpointer);
-typedef gboolean (*GntTreeHashEqualityFunc)(gconstpointer, gconstpointer);
+typedef guint (*GntTreeHashFunc)(gconstpointer key);
+typedef gboolean (*GntTreeHashEqualityFunc)(gconstpointer a, gconstpointer b);
 
 typedef struct _GntTree			GntTree;
 typedef struct _GntTreePriv		GntTreePriv;
diff --git a/finch/libgnt/gntwidget.c b/finch/libgnt/gntwidget.c
--- a/finch/libgnt/gntwidget.c
+++ b/finch/libgnt/gntwidget.c
@@ -302,15 +302,15 @@ void gnt_widget_set_take_focus(GntWidget
 }
 
 void
-gnt_widget_destroy(GntWidget *obj)
+gnt_widget_destroy(GntWidget *widget)
 {
-	g_return_if_fail(GNT_IS_WIDGET(obj));
+	g_return_if_fail(GNT_IS_WIDGET(widget));
 
-	if(!(GNT_WIDGET_FLAGS(obj) & GNT_WIDGET_DESTROYING)) {
-		GNT_WIDGET_SET_FLAGS(obj, GNT_WIDGET_DESTROYING);
-		gnt_widget_hide(obj);
-		delwin(obj->window);
-		g_object_run_dispose(G_OBJECT(obj));
+	if(!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_DESTROYING)) {
+		GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DESTROYING);
+		gnt_widget_hide(widget);
+		delwin(widget->window);
+		g_object_run_dispose(G_OBJECT(widget));
 	}
 	GNTDEBUG;
 }
diff --git a/finch/libgnt/gntwidget.h b/finch/libgnt/gntwidget.h
--- a/finch/libgnt/gntwidget.h
+++ b/finch/libgnt/gntwidget.h
@@ -116,20 +116,20 @@ struct _GntWidgetClass
 {
 	GntBindableClass parent;
 
-	void (*map)(GntWidget *obj);
-	void (*show)(GntWidget *obj);		/* This will call draw() and take focus (if it can take focus) */
-	void (*destroy)(GntWidget *obj);
-	void (*draw)(GntWidget *obj);		/* This will draw the widget */
-	void (*hide)(GntWidget *obj);
+	void (*map)(GntWidget *widget);
+	void (*show)(GntWidget *widget);		/* This will call draw() and take focus (if it can take focus) */
+	void (*destroy)(GntWidget *widget);
+	void (*draw)(GntWidget *widget);		/* This will draw the widget */
+	void (*hide)(GntWidget *widget);
 	void (*expose)(GntWidget *widget, int x, int y, int width, int height);
 	void (*gained_focus)(GntWidget *widget);
 	void (*lost_focus)(GntWidget *widget);
 
 	void (*size_request)(GntWidget *widget);
-	gboolean (*confirm_size)(GntWidget *widget, int x, int y);
+	gboolean (*confirm_size)(GntWidget *widget, int width, int height);
 	void (*size_changed)(GntWidget *widget, int w, int h);
 	void (*set_position)(GntWidget *widget, int x, int y);
-	gboolean (*key_pressed)(GntWidget *widget, const char *key);
+	gboolean (*key_pressed)(GntWidget *widget, const char *keys);
 	void (*activate)(GntWidget *widget);
 	gboolean (*clicked)(GntWidget *widget, GntMouseEvent event, int x, int y);
 
diff --git a/finch/libgnt/gntwindow.h b/finch/libgnt/gntwindow.h
--- a/finch/libgnt/gntwindow.h
+++ b/finch/libgnt/gntwindow.h
@@ -151,8 +151,8 @@ void gnt_window_set_maximize(GntWindow *
  */
 GntWindowFlags gnt_window_get_maximize(GntWindow *window);
 
-void gnt_window_workspace_hiding(GntWindow *);
-void gnt_window_workspace_showing(GntWindow *);
+void gnt_window_workspace_hiding(GntWindow *window);
+void gnt_window_workspace_showing(GntWindow *window);
 
 G_END_DECLS
 
diff --git a/finch/libgnt/gntwm.h b/finch/libgnt/gntwm.h
--- a/finch/libgnt/gntwm.h
+++ b/finch/libgnt/gntwm.h
@@ -141,7 +141,7 @@ struct _GntWMClass
 	GntBindableClass parent;
 
 	/* This is called when a new window is shown */
-	void (*new_window)(GntWM *wm, GntWidget *win);
+	void (*new_window)(GntWM *wm, GntWidget *widget);
 
 	void (*decorate_window)(GntWM *wm, GntWidget *win);
 	/* This is called when a window is being closed */
diff --git a/finch/libgnt/gntws.h b/finch/libgnt/gntws.h
--- a/finch/libgnt/gntws.h
+++ b/finch/libgnt/gntws.h
@@ -61,7 +61,7 @@ struct _GntWSClass
 {
 	GntBindableClass parent;
 
-	void (*draw_taskbar)(GntWS *ws, gboolean );
+	void (*draw_taskbar)(GntWS *ws, gboolean reposition);
 
 	void (*res1)(void);
 	void (*res2)(void);

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits