/soc/2013/ankitkv/gobjectification: 63a5361c11a1: Merge gtkdoc-c...

Ankit Vani a at nevitus.org
Sun Feb 9 15:53:00 EST 2014


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

Description:

Merge gtkdoc-conversion

diffstat:

 ChangeLog.API                |   14 +
 pidgin/gtkblist.c            |   10 +-
 pidgin/gtkblist.h            |    4 +-
 pidgin/gtkconv.c             |  268 ++++++++++----------
 pidgin/gtkdebug.c            |   24 +-
 pidgin/gtkdialogs.c          |    4 +-
 pidgin/gtkdnd-hints.c        |   20 +-
 pidgin/gtkdnd-hints.h        |   26 +-
 pidgin/gtknickcolors.h       |    2 +-
 pidgin/gtknotify.c           |    4 +-
 pidgin/gtkpluginpref.c       |   10 +-
 pidgin/gtkpounce.c           |    6 +-
 pidgin/gtkprefs.c            |   64 ++--
 pidgin/gtkrequest.c          |    4 +-
 pidgin/gtksavedstatuses.c    |   16 +-
 pidgin/gtksmiley.c           |   38 +-
 pidgin/gtksmiley.h           |   12 +-
 pidgin/gtkstatusbox.c        |   50 +-
 pidgin/gtkthemes.c           |   56 ++--
 pidgin/gtkthemes.h           |   10 +-
 pidgin/gtkutils.c            |   88 +++---
 pidgin/gtkutils.h            |    2 +-
 pidgin/gtkwebview.c          |  564 +++++++++++++++++++++---------------------
 pidgin/gtkwebview.h          |  564 +++++++++++++++++++++---------------------
 pidgin/gtkwebviewtoolbar.c   |  392 ++++++++++++++--------------
 pidgin/gtkwebviewtoolbar.h   |   74 ++--
 pidgin/gtkwhiteboard.c       |   28 +-
 pidgin/gtkwhiteboard.h       |   10 +-
 pidgin/plugins/history.c     |   14 +-
 pidgin/plugins/markerline.c  |    6 +-
 pidgin/plugins/xmppconsole.c |   36 +-
 pidgin/smileyparser.c        |    4 +-
 pidgin/smileyparser.h        |    2 +-
 33 files changed, 1220 insertions(+), 1206 deletions(-)

diffs (truncated from 6509 to 300 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -555,8 +555,22 @@ version 3.0.0 (??/??/????):
 
 		Changed:
 		* gtkft.h file renamed to gtkxfer.h
+		* pidgin_blist_sort_method renamed to _PidginBlistSortMethod
+		* BRUSH_STATE_DOWN renamed to PIDGIN_BRUSH_STATE_DOWN
+		* BRUSH_STATE_MOTION renamed to PIDGIN_BRUSH_STATE_MOTION
+		* BRUSH_STATE_UP renamed to PIDGIN_BRUSH_STATE_UP
+		* DEFAULT_FONT_FACE renamed to PIDGIN_DEFAULT_FONT_FACE
+		* DndHintPosition renamed to PidginDndHintPosition
+		* DndHintWindowId renamed to PidginDndHintWindowId
+		* dnd_* functions renamed to pidgin_dnd_*
+		* FULL_CIRCLE_DEGREES renamed to PIDGIN_FULL_CIRCLE_DEGREES
+		* NUM_NICK_SEED_COLORS renamed to PIDGIN_NUM_NICK_SEED_COLORS
+		* PALETTE_NUM_COLORS renamed to PIDGIN_PALETTE_NUM_COLORS
 		* pidgin_setup_screenname_autocomplete now takes a filter function and
 		  its data as final two arguments
+		* smiley_list renamed to PidginSmileyList
+		* smiley_parse_markup renamed to pidgin_smiley_parse_markup
+		* smiley_theme renamed to PidginSmileyTheme
 
 		Removed:
 		* GtkIMHtml.clipboard_html_string
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -141,7 +141,7 @@ static gboolean gtk_blist_focused = FALS
 static gboolean editing_blist = FALSE;
 
 static GList *pidgin_blist_sort_methods = NULL;
-static struct pidgin_blist_sort_method *current_sort_method = NULL;
+static struct _PidginBlistSortMethod *current_sort_method = NULL;
 static void sort_method_none(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
 
 static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
@@ -7764,13 +7764,13 @@ GList *pidgin_blist_get_sort_methods()
 
 void pidgin_blist_sort_method_reg(const char *id, const char *name, pidgin_blist_sort_function func)
 {
-	struct pidgin_blist_sort_method *method;
+	struct _PidginBlistSortMethod *method;
 
 	g_return_if_fail(id != NULL);
 	g_return_if_fail(name != NULL);
 	g_return_if_fail(func != NULL);
 
-	method = g_new0(struct pidgin_blist_sort_method, 1);
+	method = g_new0(struct _PidginBlistSortMethod, 1);
 	method->id = g_strdup(id);
 	method->name = g_strdup(name);
 	method->func = func;
@@ -7785,7 +7785,7 @@ void pidgin_blist_sort_method_unreg(cons
 	g_return_if_fail(id != NULL);
 
 	while(l) {
-		struct pidgin_blist_sort_method *method = l->data;
+		struct _PidginBlistSortMethod *method = l->data;
 		if(!strcmp(method->id, id)) {
 			pidgin_blist_sort_methods = g_list_delete_link(pidgin_blist_sort_methods, l);
 			g_free(method->id);
@@ -7804,7 +7804,7 @@ void pidgin_blist_sort_method_set(const 
 	if(!id)
 		id = "none";
 
-	while (l && strcmp(((struct pidgin_blist_sort_method*)l->data)->id, id))
+	while (l && strcmp(((struct _PidginBlistSortMethod*)l->data)->id, id))
 		l = l->next;
 
 	if (l) {
diff --git a/pidgin/gtkblist.h b/pidgin/gtkblist.h
--- a/pidgin/gtkblist.h
+++ b/pidgin/gtkblist.h
@@ -327,13 +327,13 @@ typedef void (*pidgin_blist_sort_functio
  */
 GList *pidgin_blist_get_sort_methods(void);
 
-struct pidgin_blist_sort_method {
+struct _PidginBlistSortMethod {
 	char *id;
 	char *name;
 	pidgin_blist_sort_function func;
 };
 
-typedef struct pidgin_blist_sort_method PidginBlistSortMethod;
+typedef struct _PidginBlistSortMethod PidginBlistSortMethod;
 
 /**
  * pidgin_blist_sort_method_reg:
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -310,28 +310,28 @@ static void
 default_formatize(PidginConversation *c)
 {
 	PurpleConversation *conv = c->active_conv;
-	gtk_webview_setup_entry(GTK_WEBVIEW(c->entry), purple_conversation_get_features(conv));
+	pidgin_webview_setup_entry(PIDGIN_WEBVIEW(c->entry), purple_conversation_get_features(conv));
 }
 
 static void
 conversation_entry_clear(PidginConversation *gtkconv)
 {
-	GtkWebView *webview = GTK_WEBVIEW(gtkconv->entry);
+	PidginWebView *webview = PIDGIN_WEBVIEW(gtkconv->entry);
 
 	//XXX: hotfix for not focused entry after sending a message
-	//gtk_webview_load_html_string(webview, "");
-	gtk_webview_load_html_string_with_selection(webview, "<div id='caret'></div>");
+	//pidgin_webview_load_html_string(webview, "");
+	pidgin_webview_load_html_string_with_selection(webview, "<div id='caret'></div>");
 
 #if 0
 	/* TODO WebKit */
 	gtk_source_undo_manager_begin_not_undoable_action(webview->undo_manager);
-	gtk_webview_clear(webview);
+	pidgin_webview_clear(webview);
 	gtk_source_undo_manager_end_not_undoable_action(webview->undo_manager);
 #endif
 }
 
 static void
-clear_formatting_cb(GtkWebView *webview, PidginConversation *gtkconv)
+clear_formatting_cb(PidginWebView *webview, PidginConversation *gtkconv)
 {
 	default_formatize(gtkconv);
 }
@@ -522,13 +522,13 @@ check_for_and_do_command(PurpleConversat
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	prefix = pidgin_get_cmd_prefix();
 
-	cmd = gtk_webview_get_body_text(GTK_WEBVIEW(gtkconv->entry));
+	cmd = pidgin_webview_get_body_text(PIDGIN_WEBVIEW(gtkconv->entry));
 
 	if (cmd && purple_str_has_prefix(cmd, prefix)) {
 		PurpleCmdStatus status;
 		char *error, *cmdline, *markup, *send_history;
 
-		send_history = gtk_webview_get_body_html(GTK_WEBVIEW(gtkconv->entry));
+		send_history = pidgin_webview_get_body_html(PIDGIN_WEBVIEW(gtkconv->entry));
 		send_history_add(gtkconv, send_history);
 		g_free(send_history);
 
@@ -542,7 +542,7 @@ check_for_and_do_command(PurpleConversat
 		}
 
 		/* TODO WebKit: Cut out prefix for markup... */
-		markup = gtk_webview_get_body_html(GTK_WEBVIEW(gtkconv->entry));
+		markup = pidgin_webview_get_body_html(PIDGIN_WEBVIEW(gtkconv->entry));
 		status = purple_cmd_do_command(conv, cmdline, markup, &error);
 		g_free(markup);
 
@@ -631,8 +631,8 @@ send_cb(GtkWidget *widget, PidginConvers
 	if (!purple_account_is_connected(account))
 		return;
 
-	buf = gtk_webview_get_body_html(GTK_WEBVIEW(gtkconv->entry));
-	clean = gtk_webview_get_body_text(GTK_WEBVIEW(gtkconv->entry));
+	buf = pidgin_webview_get_body_html(PIDGIN_WEBVIEW(gtkconv->entry));
+	clean = pidgin_webview_get_body_text(PIDGIN_WEBVIEW(gtkconv->entry));
 
 	gtk_widget_grab_focus(gtkconv->entry);
 
@@ -647,7 +647,7 @@ send_cb(GtkWidget *widget, PidginConvers
 #if 0
 	/* TODO WebKit: Image stuff... */
 	/* XXX: is there a better way to tell if the message has images? */
-	if (GTK_WEBVIEW(gtkconv->entry)->im_images != NULL)
+	if (PIDGIN_WEBVIEW(gtkconv->entry)->im_images != NULL)
 		flags |= PURPLE_MESSAGE_IMAGES;
 #endif
 
@@ -658,7 +658,7 @@ send_cb(GtkWidget *widget, PidginConvers
 		char **bufs;
 		int i;
 
-		bufs = gtk_webview_get_markup_lines(GTK_WEBVIEW(gtkconv->entry));
+		bufs = pidgin_webview_get_markup_lines(PIDGIN_WEBVIEW(gtkconv->entry));
 		for (i = 0; bufs[i]; i++) {
 			send_history_add(gtkconv, bufs[i]);
 			purple_conversation_send_with_flags(conv, bufs[i], flags);
@@ -1049,7 +1049,7 @@ static void
 savelog_writefile_cb(void *user_data, const char *filename)
 {
 	PurpleConversation *conv = (PurpleConversation *)user_data;
-	GtkWebView *webview;
+	PidginWebView *webview;
 	FILE *fp;
 	const char *name;
 	gchar *text;
@@ -1061,21 +1061,21 @@ savelog_writefile_cb(void *user_data, co
 		return;
 	}
 
-	webview = GTK_WEBVIEW(PIDGIN_CONVERSATION(conv)->webview);
+	webview = PIDGIN_WEBVIEW(PIDGIN_CONVERSATION(conv)->webview);
 	name = purple_conversation_get_name(conv);
 	fprintf(fp, "<html>\n");
 
 	fprintf(fp, "<head>\n");
 	fprintf(fp, "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">\n");
 	fprintf(fp, "<title>%s</title>\n", name);
-	text = gtk_webview_get_head_html(webview);
+	text = pidgin_webview_get_head_html(webview);
 	fprintf(fp, "%s", text);
 	g_free(text);
 	fprintf(fp, "</head>\n");
 
 	fprintf(fp, "<body>\n");
 	fprintf(fp, _("<h1>Conversation with %s</h1>\n"), name);
-	text = gtk_webview_get_body_html(webview);
+	text = pidgin_webview_get_body_html(webview);
 	fprintf(fp, "%s", text);
 	g_free(text);
 	fprintf(fp, "\n</body>\n");
@@ -1249,12 +1249,12 @@ menu_insert_link_cb(GtkAction *action, g
 {
 	PidginWindow *win = data;
 	PidginConversation *gtkconv;
-	GtkWebView *entry;
+	PidginWebView *entry;
 
 	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
-	entry = GTK_WEBVIEW(gtkconv->entry);
-
-	gtk_webview_activate_toolbar(entry, GTK_WEBVIEW_ACTION_LINK);
+	entry = PIDGIN_WEBVIEW(gtkconv->entry);
+
+	pidgin_webview_activate_toolbar(entry, PIDGIN_WEBVIEW_ACTION_LINK);
 }
 
 static void
@@ -1262,12 +1262,12 @@ menu_insert_image_cb(GtkAction *action, 
 {
 	PidginWindow *win = data;
 	PidginConversation *gtkconv;
-	GtkWebView *entry;
+	PidginWebView *entry;
 
 	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
-	entry = GTK_WEBVIEW(gtkconv->entry);
-
-	gtk_webview_activate_toolbar(entry, GTK_WEBVIEW_ACTION_IMAGE);
+	entry = PIDGIN_WEBVIEW(gtkconv->entry);
+
+	pidgin_webview_activate_toolbar(entry, PIDGIN_WEBVIEW_ACTION_IMAGE);
 }
 
 static void
@@ -1949,7 +1949,7 @@ update_typing_inserting(PidginConversati
 
 	g_return_if_fail(gtkconv != NULL);
 
-	text = gtk_webview_get_body_text(GTK_WEBVIEW(gtkconv->entry));
+	text = pidgin_webview_get_body_text(PIDGIN_WEBVIEW(gtkconv->entry));
 
 	got_typing_keypress(gtkconv, text[0] == '\0' || !strcmp(text, "\n"));
 
@@ -1960,7 +1960,7 @@ static gboolean
 update_typing_deleting_cb(PidginConversation *gtkconv)
 {
 	PurpleIMConversation *im = PURPLE_IM_CONVERSATION(gtkconv->active_conv);
-	gchar *text = gtk_webview_get_body_text(GTK_WEBVIEW(gtkconv->entry));
+	gchar *text = pidgin_webview_get_body_text(PIDGIN_WEBVIEW(gtkconv->entry));
 
 	if (!*text || !strcmp(text, "\n")) {
 		/* We deleted all the text, so turn off typing. */
@@ -1986,7 +1986,7 @@ update_typing_deleting(PidginConversatio
 
 	g_return_if_fail(gtkconv != NULL);
 
-	text = gtk_webview_get_body_text(GTK_WEBVIEW(gtkconv->entry));
+	text = pidgin_webview_get_body_text(PIDGIN_WEBVIEW(gtkconv->entry));
 
 	if (*text && strcmp(text, "\n"))
 		purple_timeout_add(0, (GSourceFunc)update_typing_deleting_cb, gtkconv);
@@ -2119,7 +2119,7 @@ entry_key_press_cb(GtkWidget *entry, Gdk
 					g_free(gtkconv->send_history->data);
 
 					gtkconv->send_history->data =
-						gtk_webview_get_body_html(GTK_WEBVIEW(gtkconv->entry));
+						pidgin_webview_get_body_html(PIDGIN_WEBVIEW(gtkconv->entry));
 				}
 
 				if (gtkconv->send_history->next && gtkconv->send_history->next->data) {
@@ -2137,13 +2137,13 @@ entry_key_press_cb(GtkWidget *entry, Gdk
 					g_signal_handlers_block_matched(object, G_SIGNAL_MATCH_DATA,
 					                                0, 0, NULL, NULL, gtkconv);
 					/* Clear the formatting. */
-					gtk_webview_clear_formatting(GTK_WEBVIEW(gtkconv->entry));
+					pidgin_webview_clear_formatting(PIDGIN_WEBVIEW(gtkconv->entry));
 					/* Unblock the signal. */
 					g_signal_handlers_unblock_matched(object, G_SIGNAL_MATCH_DATA,
 					                                  0, 0, NULL, NULL, gtkconv);
 					g_object_unref(object);
 
-					gtk_webview_load_html_string(GTK_WEBVIEW(gtkconv->entry),
+					pidgin_webview_load_html_string(PIDGIN_WEBVIEW(gtkconv->entry),



More information about the Commits mailing list