/soc/2013/ankitkv/gobjectification: f965c53ae7c2: Merge gtkdoc-c...

Ankit Vani a at nevitus.org
Sun Feb 9 11:50:08 EST 2014


Changeset: f965c53ae7c28ab83dd980c75add52720219cfc8
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-02-09 22:19 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/f965c53ae7c2

Description:

Merge gtkdoc-conversion

diffstat:

 ChangeLog.API                  |     8 +
 finch/finch.c                  |     2 +-
 finch/finch.h                  |     4 +-
 finch/gntblist.c               |     6 +-
 finch/gntconv.c                |     2 +-
 finch/gntmenuutil.c            |     4 +-
 finch/gntmenuutil.h            |     4 +-
 finch/gntui.c                  |     4 +-
 finch/gntui.h                  |     4 +-
 finch/libfinch.c               |     6 +-
 finch/libgnt/gnt-skel.c        |     4 +-
 finch/libgnt/gntbindable.c     |     8 +-
 finch/libgnt/gntentry.c        |     2 +-
 finch/libgnt/gntentry.h        |     2 +-
 finch/libgnt/gntutils.c        |     8 +-
 finch/libgnt/gntutils.h        |     6 +-
 pidgin/Makefile.am             |     6 -
 pidgin/Makefile.mingw          |     2 -
 pidgin/gtksourceiter.c         |   766 -------------------------
 pidgin/gtksourceiter.h         |    67 --
 pidgin/gtksourceundomanager.c  |  1197 ----------------------------------------
 pidgin/gtksourceundomanager.h  |    93 ---
 pidgin/gtksourceview-marshal.c |    95 ---
 pidgin/gtksourceview-marshal.h |    32 -
 24 files changed, 41 insertions(+), 2291 deletions(-)

diffs (truncated from 2625 to 300 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -588,8 +588,16 @@ version 3.0.0 (??/??/????):
 
 		Changed:
 		* gntft.h file renamed to gntxfer.h
+		* gnt_append_menu_action renamed to finch_append_menu_action
+		* gnt_ui_init renamed to finch_ui_init
+		* gnt_ui_uninit renamed to finch_ui_uninit
 
 	libgnt:
+		Changed:
+		* ENTRY_CHAR renamed to GNT_ENTRY_CHAR
+		* g_hash_table_duplicate renamed to gnt_hash_table_duplicate
+		* GDupFunc renamed to GntDuplicateFunc
+
 		Removed:
 		* _GntFileType
 		* _GntKeyPressMode
diff --git a/finch/finch.c b/finch/finch.c
--- a/finch/finch.c
+++ b/finch/finch.c
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 	g_set_prgname("Finch");
 	g_set_application_name(_("Finch"));
 
-	if (gnt_start(&argc, &argv)) {
+	if (finch_start(&argc, &argv)) {
 		gnt_main();
 
 #ifdef STANDALONE
diff --git a/finch/finch.h b/finch/finch.h
--- a/finch/finch.h
+++ b/finch/finch.h
@@ -38,10 +38,10 @@
 #define FINCH_SET_DATA(obj, data)  (obj)->ui_data = data
 
 /**
- * gnt_start:
+ * finch_start:
  *
  * Start finch with the given command line arguments.
  */
-gboolean gnt_start(int *argc, char ***argv);
+gboolean finch_start(int *argc, char ***argv);
 
 #endif
diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -1067,7 +1067,7 @@ append_proto_menu(GntMenu *menu, PurpleC
 		if (!act)
 			continue;
 		purple_menu_action_set_data(act, node);
-		gnt_append_menu_action(menu, act, node);
+		finch_append_menu_action(menu, act, node);
 	}
 }
 
@@ -1076,7 +1076,7 @@ add_custom_action(GntMenu *menu, const c
 		gpointer data)
 {
 	PurpleMenuAction *action = purple_menu_action_new(label, callback, data, NULL);
-	gnt_append_menu_action(menu, action, NULL);
+	finch_append_menu_action(menu, action, NULL);
 }
 
 static void
@@ -1314,7 +1314,7 @@ append_extended_menu(GntMenu *menu, Purp
 	for (iter = purple_blist_node_get_extended_menu(node);
 			iter; iter = g_list_delete_link(iter, iter))
 	{
-		gnt_append_menu_action(menu, iter->data, node);
+		finch_append_menu_action(menu, iter->data, node);
 	}
 }
 
diff --git a/finch/gntconv.c b/finch/gntconv.c
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -396,7 +396,7 @@ gg_extended_menu(FinchConv *ggc)
 	for (list = purple_conversation_get_extended_menu(ggc->active_conv);
 			list; list = g_list_delete_link(list, list))
 	{
-		gnt_append_menu_action(GNT_MENU(sub), list->data, ggc->active_conv);
+		finch_append_menu_action(GNT_MENU(sub), list->data, ggc->active_conv);
 	}
 }
 
diff --git a/finch/gntmenuutil.c b/finch/gntmenuutil.c
--- a/finch/gntmenuutil.c
+++ b/finch/gntmenuutil.c
@@ -43,7 +43,7 @@ context_menu_callback(GntMenuItem *item,
 }
 
 void
-gnt_append_menu_action(GntMenu *menu, PurpleMenuAction *action, gpointer ctx)
+finch_append_menu_action(GntMenu *menu, PurpleMenuAction *action, gpointer ctx)
 {
 	GList *list;
 	GntMenuItem *item;
@@ -64,7 +64,7 @@ gnt_append_menu_action(GntMenu *menu, Pu
 		GntWidget *sub = gnt_menu_new(GNT_MENU_POPUP);
 		gnt_menuitem_set_submenu(item, GNT_MENU(sub));
 		for (; list; list = g_list_delete_link(list, list))
-			gnt_append_menu_action(GNT_MENU(sub), list->data, action);
+			finch_append_menu_action(GNT_MENU(sub), list->data, action);
 		purple_menu_action_set_children(action, NULL);
 	}
 
diff --git a/finch/gntmenuutil.h b/finch/gntmenuutil.h
--- a/finch/gntmenuutil.h
+++ b/finch/gntmenuutil.h
@@ -36,7 +36,7 @@
  ***************************************************************************/
 
 /**
- * gnt_append_menu_action:
+ * finch_append_menu_action:
  * @menu:   the GntMenu to add to
  * @action: the PurpleMenuAction to add
  * @ctx:    the callback context, passed as the first argument to
@@ -44,6 +44,6 @@
  *
  * Add a PurpleMenuAction to a GntMenu.
  */
-void gnt_append_menu_action(GntMenu *menu, PurpleMenuAction *action, gpointer ctx);
+void finch_append_menu_action(GntMenu *menu, PurpleMenuAction *action, gpointer ctx);
 
 #endif
diff --git a/finch/gntui.c b/finch/gntui.c
--- a/finch/gntui.c
+++ b/finch/gntui.c
@@ -44,7 +44,7 @@
 
 #include <prefs.h>
 
-void gnt_ui_init()
+void finch_ui_init()
 {
 #ifdef STANDALONE
 	gnt_init();
@@ -112,7 +112,7 @@ void gnt_ui_init()
 #ifdef STANDALONE
 }
 
-void gnt_ui_uninit()
+void finch_ui_uninit()
 {
 	purple_accounts_set_ui_ops(NULL);
 	finch_accounts_uninit();
diff --git a/finch/gntui.h b/finch/gntui.h
--- a/finch/gntui.h
+++ b/finch/gntui.h
@@ -31,7 +31,7 @@
 
 #include "gnt.h"
 
-void gnt_ui_init(void);
-void gnt_ui_uninit(void);
+void finch_ui_init(void);
+void finch_ui_uninit(void);
 
 #endif
diff --git a/finch/libfinch.c b/finch/libfinch.c
--- a/finch/libfinch.c
+++ b/finch/libfinch.c
@@ -113,7 +113,7 @@ static GHashTable *finch_ui_get_info(voi
 static void
 finch_quit(void)
 {
-	gnt_ui_uninit();
+	finch_ui_uninit();
 	if (ui_info)
 		g_hash_table_destroy(ui_info);
 }
@@ -122,7 +122,7 @@ static PurpleCoreUiOps core_ops =
 {
 	finch_prefs_init,
 	debug_init,
-	gnt_ui_init,
+	finch_ui_init,
 	finch_quit,
 	finch_ui_get_info,
 
@@ -409,7 +409,7 @@ init_libpurple(int argc, char **argv)
 	return 1;
 }
 
-gboolean gnt_start(int *argc, char ***argv)
+gboolean finch_start(int *argc, char ***argv)
 {
 	/* Initialize the libpurple stuff */
 	if (!init_libpurple(*argc, *argv))
diff --git a/finch/libgnt/gnt-skel.c b/finch/libgnt/gnt-skel.c
--- a/finch/libgnt/gnt-skel.c
+++ b/finch/libgnt/gnt-skel.c
@@ -72,9 +72,9 @@ gnt_skel_class_init(GntSkelClass *klass)
 	parent_class->size_request = gnt_skel_size_request;
 	parent_class->key_pressed = gnt_skel_key_pressed;
 
-	parent_class->actions = g_hash_table_duplicate(parent_class->actions, g_str_hash,
+	parent_class->actions = gnt_hash_table_duplicate(parent_class->actions, g_str_hash,
 				g_str_equal, NULL, (GDestroyNotify)gnt_widget_action_free);
-	parent_class->bindings = g_hash_table_duplicate(parent_class->bindings, g_str_hash,
+	parent_class->bindings = gnt_hash_table_duplicate(parent_class->bindings, g_str_hash,
 				g_str_equal, NULL, (GDestroyNotify)gnt_widget_action_param_free);
 
 	gnt_widget_actions_read(G_OBJECT_CLASS_TYPE(klass), klass);
diff --git a/finch/libgnt/gntbindable.c b/finch/libgnt/gntbindable.c
--- a/finch/libgnt/gntbindable.c
+++ b/finch/libgnt/gntbindable.c
@@ -237,12 +237,12 @@ duplicate_hashes(GntBindableClass *klass
 {
 	/* Duplicate the bindings from parent class */
 	if (klass->actions) {
-		klass->actions = g_hash_table_duplicate(klass->actions, g_str_hash,
+		klass->actions = gnt_hash_table_duplicate(klass->actions, g_str_hash,
 					g_str_equal, g_free, (GDestroyNotify)gnt_bindable_action_free,
-					(GDupFunc)g_strdup, (GDupFunc)bindable_clone);
-		klass->bindings = g_hash_table_duplicate(klass->bindings, g_str_hash,
+					(GntDuplicateFunc)g_strdup, (GntDuplicateFunc)bindable_clone);
+		klass->bindings = gnt_hash_table_duplicate(klass->bindings, g_str_hash,
 					g_str_equal, g_free, (GDestroyNotify)gnt_bindable_action_param_free,
-					(GDupFunc)g_strdup, (GDupFunc)binding_clone);
+					(GntDuplicateFunc)g_strdup, (GntDuplicateFunc)binding_clone);
 	} else {
 		klass->actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
 					(GDestroyNotify)gnt_bindable_action_free);
diff --git a/finch/libgnt/gntentry.c b/finch/libgnt/gntentry.c
--- a/finch/libgnt/gntentry.c
+++ b/finch/libgnt/gntentry.c
@@ -294,7 +294,7 @@ gnt_entry_draw(GntWidget *widget)
 
 	stop = gnt_util_onscreen_width(entry->scroll, entry->end);
 	if (stop < widget->priv.width)
-		mvwhline(widget->window, 0, stop, ENTRY_CHAR, widget->priv.width - stop);
+		mvwhline(widget->window, 0, stop, GNT_ENTRY_CHAR, widget->priv.width - stop);
 
 	curpos = gnt_util_onscreen_width(entry->scroll, entry->cursor);
 	if (focus)
diff --git a/finch/libgnt/gntentry.h b/finch/libgnt/gntentry.h
--- a/finch/libgnt/gntentry.h
+++ b/finch/libgnt/gntentry.h
@@ -45,7 +45,7 @@
 #define GNT_ENTRY_SET_FLAGS(obj, flags)		(GNT_ENTRY_FLAGS(obj) |= flags)
 #define GNT_ENTRY_UNSET_FLAGS(obj, flags)	(GNT_ENTRY_FLAGS(obj) &= ~(flags))
 
-#define	ENTRY_CHAR		'_'			/* The character to use to fill in the blank places */
+#define	GNT_ENTRY_CHAR		'_'			/* The character to use to fill in the blank places */
 
 typedef struct _GntEntry			GntEntry;
 typedef struct _GntEntryPriv		GntEntryPriv;
diff --git a/finch/libgnt/gntutils.c b/finch/libgnt/gntutils.c
--- a/finch/libgnt/gntutils.c
+++ b/finch/libgnt/gntutils.c
@@ -148,8 +148,8 @@ char *gnt_util_onscreen_fit_string(const
 
 struct duplicate_fns
 {
-	GDupFunc key_dup;
-	GDupFunc value_dup;
+	GntDuplicateFunc key_dup;
+	GntDuplicateFunc value_dup;
 	GHashTable *table;
 };
 
@@ -161,9 +161,9 @@ duplicate_values(gpointer key, gpointer 
 			fns->value_dup ? fns->value_dup(value) : value);
 }
 
-GHashTable *g_hash_table_duplicate(GHashTable *src, GHashFunc hash,
+GHashTable *gnt_hash_table_duplicate(GHashTable *src, GHashFunc hash,
 		GEqualFunc equal, GDestroyNotify key_d, GDestroyNotify value_d,
-		GDupFunc key_dup, GDupFunc value_dup)
+		GntDuplicateFunc key_dup, GntDuplicateFunc value_dup)
 {
 	GHashTable *dest = g_hash_table_new_full(hash, equal, key_d, value_d);
 	struct duplicate_fns fns = {key_dup, value_dup, dest};
diff --git a/finch/libgnt/gntutils.h b/finch/libgnt/gntutils.h
--- a/finch/libgnt/gntutils.h
+++ b/finch/libgnt/gntutils.h
@@ -35,7 +35,7 @@
 #include "gnttextview.h"
 #include "gntwidget.h"
 
-typedef gpointer (*GDupFunc)(gconstpointer data);
+typedef gpointer (*GntDuplicateFunc)(gconstpointer data);
 
 /**
  * gnt_util_get_text_bound:
@@ -87,7 +87,7 @@ const char *gnt_util_onscreen_width_to_p
 char * gnt_util_onscreen_fit_string(const char *string, int maxw);
 
 /**
- * g_hash_table_duplicate:
+ * gnt_hash_table_duplicate:
  * @src:         The source hashtable.
  * @hash:        The hash-function to use.



More information about the Commits mailing list