/soc/2013/ankitkv/gobjectification: 65e25c679ca5: Merged default...

Ankit Vani a at nevitus.org
Fri Aug 23 05:38:44 EDT 2013


Changeset: 65e25c679ca51f0a488d3eab2fe511f22c338624
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-23 15:07 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/65e25c679ca5

Description:

Merged default branch

diffstat:

 configure.ac                                 |   11 +-
 finch/gntdebug.c                             |    1 +
 finch/gntrequest.c                           |    4 +-
 finch/libgnt/gntcolors.c                     |    2 +-
 finch/libgnt/gntentry.c                      |   11 +-
 finch/libgnt/gntentry.h                      |    2 +-
 finch/libgnt/gntmenu.c                       |    9 +-
 finch/libgnt/gntmenu.h                       |    2 +-
 finch/libgnt/gntstyle.c                      |    2 +-
 finch/libgnt/gnttextview.c                   |    2 +-
 finch/libgnt/gntwm.c                         |    3 +-
 libpurple/cipher.c                           |  127 +--------------------------
 libpurple/circularbuffer.c                   |   10 +-
 libpurple/dnsquery.c                         |    6 +-
 libpurple/dnssrv.c                           |    2 +-
 libpurple/ft.c                               |   10 +-
 libpurple/http.c                             |   23 +++-
 libpurple/plugins/perl/Makefile.am           |    3 +-
 libpurple/plugins/perl/common/Makefile.PL.in |    2 +-
 libpurple/proxy.c                            |    6 +-
 libpurple/util.c                             |    4 +-
 pidgin/gtkconv.c                             |    4 +-
 pidgin/gtkdebug.c                            |    2 +-
 pidgin/gtkft.c                               |    4 +-
 pidgin/gtkimhtml.c                           |    2 +-
 pidgin/gtkmain.c                             |    2 +-
 pidgin/gtkprefs.c                            |    2 +-
 pidgin/gtkprivacy.c                          |   15 +-
 pidgin/gtkrequest.c                          |    8 +-
 pidgin/gtkstatusbox.c                        |    6 +-
 pidgin/gtkthemes.c                           |    2 +-
 pidgin/gtkutils.c                            |    2 +-
 pidgin/gtkwebview.c                          |    4 +-
 pidgin/gtkwebviewtoolbar.c                   |    4 +-
 pidgin/pidginstock.c                         |    4 +-
 pidgin/plugins/perl/common/Makefile.PL.in    |    2 +-
 pidgin/plugins/pidginrc.c                    |   10 +-
 pidgin/plugins/spellchk.c                    |   11 +-
 38 files changed, 107 insertions(+), 219 deletions(-)

diffs (truncated from 1135 to 300 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1427,21 +1427,13 @@ if test "x$GCC" = "xyes"; then
 	dnl	This leads to spurious warnings using GPOINTER_TO_INT(), et al. directly on a function call.
 	dnl		We'd need an intermediate variable.
 	dnl
-	dnl Consider adding -Wfloat-equal.
-	dnl	This leads to warnings with Perl.
-	dnl		Perhaps we could write ugly configure magic and pass -Wno-float-equal down to that subdirectory.
-	dnl		On the other hand, it's probably actually broken, so maybe the Perl folks should fix that?
-	dnl
-	dnl Consider removing -Wno-sign-compare (from the -Wextra set) and fixing all those cases.
-	dnl	This is likely non-trivial.
-	dnl
 	for newflag in \
 			"-Waggregate-return" \
 			"-Wcast-align" \
 			"-Wdeclaration-after-statement" \
 			"-Wendif-labels" \
 			"-Werror-implicit-function-declaration" \
-			"-Wextra -Wno-sign-compare -Wno-unused-parameter" \
+			"-Wextra -Wno-unused-parameter" \
 			"-Wformat-security" \
 				"-Werror=format-security" \
 			"-Winit-self" \
@@ -1449,6 +1441,7 @@ if test "x$GCC" = "xyes"; then
 			"-Wmissing-noreturn" \
 			"-Wmissing-prototypes" \
 			"-Wpointer-arith" \
+			"-Wfloat-equal" \
 			"-Wundef" \
 	; do
 		orig_CFLAGS="$CFLAGS"
diff --git a/finch/gntdebug.c b/finch/gntdebug.c
--- a/finch/gntdebug.c
+++ b/finch/gntdebug.c
@@ -144,6 +144,7 @@ finch_debug_print(PurpleDebugLevel level
 		}
 
 		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(debug.tview), args, flag);
+		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(debug.tview), "\n", GNT_TEXT_FLAG_NORMAL);
 		if (pos <= 1)
 			gnt_text_view_scroll(GNT_TEXT_VIEW(debug.tview), 0);
 	}
diff --git a/finch/gntrequest.c b/finch/gntrequest.c
--- a/finch/gntrequest.c
+++ b/finch/gntrequest.c
@@ -262,7 +262,7 @@ finch_request_action(const char *title, 
 		va_list actions)
 {
 	GntWidget *window, *box, *button, *focus = NULL;
-	int i;
+	gsize i;
 
 	window = setup_request_window(title, primary, secondary, PURPLE_REQUEST_ACTION);
 
@@ -281,7 +281,7 @@ finch_request_action(const char *title, 
 		g_object_set_data(G_OBJECT(button), "activate-id", GINT_TO_POINTER(i));
 		g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(request_action_cb), window);
 
-		if (i == default_value)
+		if (default_value >= 0 && i == (gsize)default_value)
 			focus = button;
 	}
 
diff --git a/finch/libgnt/gntcolors.c b/finch/libgnt/gntcolors.c
--- a/finch/libgnt/gntcolors.c
+++ b/finch/libgnt/gntcolors.c
@@ -296,7 +296,7 @@ int gnt_color_pair(int pair)
 {
 	return (hascolors ? COLOR_PAIR(pair) :
 		((pair == GNT_COLOR_NORMAL || pair == GNT_COLOR_HIGHLIGHT_D ||
-		  pair == GNT_COLOR_TITLE_D || pair == GNT_COLOR_DISABLED) ? 0 : A_STANDOUT));
+		  pair == GNT_COLOR_TITLE_D || pair == GNT_COLOR_DISABLED) ? 0 : (int)A_STANDOUT));
 }
 
 int gnt_color_add_pair(int fg, int bg)
diff --git a/finch/libgnt/gntentry.c b/finch/libgnt/gntentry.c
--- a/finch/libgnt/gntentry.c
+++ b/finch/libgnt/gntentry.c
@@ -184,7 +184,7 @@ static gboolean
 show_suggest_dropdown(GntEntry *entry)
 {
 	char *suggest = NULL;
-	int len;
+	gsize len;
 	int offset = 0, x, y;
 	int count = 0;
 	GList *iter;
@@ -815,7 +815,7 @@ gnt_entry_key_pressed(GntWidget *widget,
 
 		for (str = text; *str; str = next)
 		{
-			int len;
+			gsize len;
 			next = g_utf8_find_next_char(str, NULL);
 			len = next - str;
 
@@ -834,7 +834,7 @@ gnt_entry_key_pressed(GntWidget *widget,
 			if (entry->max && g_utf8_pointer_to_offset(entry->start, entry->end) >= entry->max)
 				continue;
 
-			if (entry->end + len - entry->start >= entry->buffer)
+			if ((gsize)(entry->end + len - entry->start) >= entry->buffer)
 			{
 				/* This will cause the buffer to grow */
 				char *tmp = g_strdup(entry->start);
@@ -1184,8 +1184,11 @@ void gnt_entry_add_to_history(GntEntry *
 {
 	g_return_if_fail(entry->history != NULL);   /* Need to set_history_length first */
 
-	if (g_list_length(entry->history) >= entry->histlength)
+	if (entry->histlength >= 0 &&
+		g_list_length(entry->history) >= (gsize)entry->histlength)
+	{
 		return;
+	}
 
 	entry->history = g_list_first(entry->history);
 	g_free(entry->history->data);
diff --git a/finch/libgnt/gntentry.h b/finch/libgnt/gntentry.h
--- a/finch/libgnt/gntentry.h
+++ b/finch/libgnt/gntentry.h
@@ -178,7 +178,7 @@ void gnt_entry_add_to_history(GntEntry *
  * Set the length of history for the entry box.
  *
  * @param entry  The entry box.
- * @param num    The maximum length of the history.
+ * @param num    The maximum length of the history, -1 for unlimited.
  */
 void gnt_entry_set_history_length(GntEntry *entry, int num);
 
diff --git a/finch/libgnt/gntmenu.c b/finch/libgnt/gntmenu.c
--- a/finch/libgnt/gntmenu.c
+++ b/finch/libgnt/gntmenu.c
@@ -79,7 +79,7 @@ gnt_menu_draw(GntWidget *widget)
 	GntMenu *menu = GNT_MENU(widget);
 	GList *iter;
 	chtype type;
-	int i;
+	guint i;
 
 	if (menu->type == GNT_MENU_TOPLEVEL) {
 		wbkgdset(widget->window, '\0' | gnt_color_pair(GNT_COLOR_HIGHLIGHT));
@@ -277,7 +277,7 @@ static gboolean
 gnt_menu_key_pressed(GntWidget *widget, const char *text)
 {
 	GntMenu *menu = GNT_MENU(widget);
-	int current = menu->selected;
+	guint current = menu->selected;
 
 	if (menu->submenu) {
 		GntMenu *sub = menu;
@@ -304,9 +304,10 @@ gnt_menu_key_pressed(GntWidget *widget, 
 
 	if (menu->type == GNT_MENU_TOPLEVEL) {
 		if (strcmp(text, GNT_KEY_LEFT) == 0) {
-			menu->selected--;
-			if (menu->selected < 0)
+			if (menu->selected == 0)
 				menu->selected = g_list_length(menu->list) - 1;
+			else
+				menu->selected--;
 		} else if (strcmp(text, GNT_KEY_RIGHT) == 0) {
 			menu->selected++;
 			if (menu->selected >= g_list_length(menu->list))
diff --git a/finch/libgnt/gntmenu.h b/finch/libgnt/gntmenu.h
--- a/finch/libgnt/gntmenu.h
+++ b/finch/libgnt/gntmenu.h
@@ -65,7 +65,7 @@ struct _GntMenu
 	GntMenuType type;
 
 	GList *list;
-	int selected;
+	guint selected;
 
 	/* This will keep track of its immediate submenu which is visible so that
 	 * keystrokes can be passed to it. */
diff --git a/finch/libgnt/gntstyle.c b/finch/libgnt/gntstyle.c
--- a/finch/libgnt/gntstyle.c
+++ b/finch/libgnt/gntstyle.c
@@ -168,7 +168,7 @@ void gnt_style_read_workspaces(GntWM *wm
 	gsize c;
 
 	for (i = 1; i < MAX_WORKSPACES; ++i) {
-		int j;
+		gsize j;
 		GntWS *ws;
 		gchar **titles;
 		char group[32];
diff --git a/finch/libgnt/gnttextview.c b/finch/libgnt/gnttextview.c
--- a/finch/libgnt/gnttextview.c
+++ b/finch/libgnt/gnttextview.c
@@ -513,7 +513,7 @@ void gnt_text_view_append_text_with_tag(
 			GntTextFormatFlags flags, const char *tagname)
 {
 	GntWidget *widget = GNT_WIDGET(view);
-	int fl = 0;
+	chtype fl = 0;
 	const char *start, *end;
 	GList *list = view->list;
 	GntTextLine *line;
diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c
+++ b/finch/libgnt/gntwm.c
@@ -427,6 +427,7 @@ switch_window(GntWM *wm, int direction, 
 
 	w = wm->cws->ordered->data;
 	orgpos = pos = g_list_index(wm->cws->list, w);
+	g_return_if_fail(pos < 0);
 
 	do {
 		pos += direction;
@@ -434,7 +435,7 @@ switch_window(GntWM *wm, int direction, 
 		if (pos < 0) {
 			wid = g_list_last(wm->cws->list)->data;
 			pos = g_list_length(wm->cws->list) - 1;
-		} else if (pos >= g_list_length(wm->cws->list)) {
+		} else if ((guint)pos >= g_list_length(wm->cws->list)) {
 			wid = wm->cws->list->data;
 			pos = 0;
 		} else
diff --git a/libpurple/cipher.c b/libpurple/cipher.c
--- a/libpurple/cipher.c
+++ b/libpurple/cipher.c
@@ -64,14 +64,6 @@ purple_cipher_get_type(void) {
 	return type;
 }
 
-/**
- * purple_cipher_reset:
- * @cipher: The cipher to reset
- *
- * Resets a cipher to it's default value
- *
- * @note If you have set an IV you will have to set it after resetting
- */
 void
 purple_cipher_reset(PurpleCipher *cipher) {
 	PurpleCipherClass *klass = NULL;
@@ -88,13 +80,6 @@ purple_cipher_reset(PurpleCipher *cipher
 						klass->get_name ? klass->get_name(cipher) : "");
 }
 
-/**
- * Resets a cipher state to it's default value, but doesn't touch stateless
- * configuration.
- *
- * That means, IV and digest context will be wiped out, but keys, ops or salt
- * will remain untouched.
- */
 void
 purple_cipher_reset_state(PurpleCipher *cipher) {
 	PurpleCipherClass *klass = NULL;
@@ -111,16 +96,6 @@ purple_cipher_reset_state(PurpleCipher *
 						klass->get_name ? klass->get_name(cipher) : "");
 }
 
-/**
- * purple_cipher_set_iv:
- * @cipher: The cipher to set the IV to
- * @iv: The initialization vector to set
- * @len: The len of the IV
- *
- * @note This should only be called right after a cipher is created or reset
- *
- * Sets the initialization vector for a cipher
- */
 void
 purple_cipher_set_iv(PurpleCipher *cipher, guchar *iv, size_t len)
 {
@@ -139,14 +114,6 @@ purple_cipher_set_iv(PurpleCipher *ciphe
 						klass->get_name ? klass->get_name(cipher) : "");
 }
 
-/**
- * purple_cipher_append:
- * @cipher: The cipher to append data to
- * @data: The data to append
- * @len: The length of the data
- *
- * Appends data to the cipher
- */
 void
 purple_cipher_append(PurpleCipher *cipher, const guchar *data,
 								size_t len)
@@ -165,17 +132,6 @@ purple_cipher_append(PurpleCipher *ciphe
 						klass->get_name ? klass->get_name(cipher) : "");
 }
 
-/**
- * purple_cipher_digest:
- * @cipher: The cipher to digest
- * @in_len: The length of the buffer
- * @digest: The return buffer for the digest
- * @out_len: The length of the returned value
- *
- * Digests a cipher
- *



More information about the Commits mailing list