/dev/tomkiewicz/gg11: 5f8f4ad241d1: Merge default

Tomasz Wasilczyk twasilczyk at pidgin.im
Mon Sep 16 05:14:15 EDT 2013


Changeset: 5f8f4ad241d1cf24e27a00d681f0dedac992dae7
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2013-09-16 10:04 +0200
Branch:	 default
URL: https://hg.pidgin.im/dev/tomkiewicz/gg11/rev/5f8f4ad241d1

Description:

Merge default

diffstat:

 Makefile.am                                  |    6 +-
 autogen.sh                                   |    4 +-
 configure.ac                                 |    8 +-
 finch/gntaccount.c                           |   22 +-
 finch/gntblist.c                             |   36 +-
 finch/gntcertmgr.c                           |   10 +-
 finch/gntconn.c                              |    3 +-
 finch/gntplugin.c                            |    5 +-
 finch/gntpounce.c                            |    3 +-
 finch/gntprefs.c                             |    5 +-
 finch/gntrequest.c                           |   53 +-
 finch/gntstatus.c                            |    3 +-
 finch/libgnt/Makefile.am                     |    8 +-
 finch/plugins/gnthistory.c                   |    2 +-
 libpurple/account.c                          |   29 +-
 libpurple/connection.c                       |   20 -
 libpurple/connection.h                       |   12 -
 libpurple/conversation.c                     |   31 +-
 libpurple/conversation.h                     |   12 +
 libpurple/ft.c                               |   37 +-
 libpurple/gconf/Makefile.am                  |    5 +-
 libpurple/http.c                             |    3 +
 libpurple/plugins/Makefile.am                |    6 +-
 libpurple/plugins/autoaccept.c               |   12 +-
 libpurple/plugins/buddynote.c                |    3 +-
 libpurple/plugins/idle.c                     |    9 +-
 libpurple/plugins/keyrings/internalkeyring.c |    2 +-
 libpurple/plugins/offlinemsg.c               |    3 +-
 libpurple/plugins/perl/Makefile.am           |    5 +-
 libpurple/plugins/perl/common/Request.xs     |    6 +-
 libpurple/protocols/bonjour/bonjour.c        |    8 +-
 libpurple/protocols/gg/account.c             |    4 +-
 libpurple/protocols/gg/gg.c                  |   17 +-
 libpurple/protocols/gg/pubdir-prpl.c         |   72 +--
 libpurple/protocols/gg/purplew.c             |    4 +-
 libpurple/protocols/gg/status.c              |    2 +-
 libpurple/protocols/irc/irc.c                |    7 +-
 libpurple/protocols/jabber/Makefile.am       |    4 +-
 libpurple/protocols/jabber/auth.c            |    2 +-
 libpurple/protocols/jabber/auth_plain.c      |    2 +-
 libpurple/protocols/jabber/buddy.c           |    9 +-
 libpurple/protocols/jabber/chat.c            |    2 +-
 libpurple/protocols/jabber/jabber.c          |   43 +-
 libpurple/protocols/jabber/presence.c        |    2 +-
 libpurple/protocols/jabber/si.c              |   11 +-
 libpurple/protocols/jabber/usernick.c        |    2 +-
 libpurple/protocols/jabber/xdata.c           |   13 +-
 libpurple/protocols/msn/error.c              |    2 +-
 libpurple/protocols/msn/msn.c                |   29 +-
 libpurple/protocols/msn/userlist.c           |    3 +-
 libpurple/protocols/mxit/actions.c           |   12 +-
 libpurple/protocols/mxit/login.c             |   15 +-
 libpurple/protocols/mxit/splashscreen.c      |    4 +-
 libpurple/protocols/myspace/myspace.c        |    4 +-
 libpurple/protocols/myspace/user.c           |   12 +-
 libpurple/protocols/novell/novell.c          |    8 +-
 libpurple/protocols/oscar/libicq.c           |    6 +-
 libpurple/protocols/oscar/oscar.c            |   22 +-
 libpurple/protocols/oscar/oscarcommon.h      |    2 +-
 libpurple/protocols/oscar/peer.c             |    2 +-
 libpurple/protocols/sametime/sametime.c      |   14 +-
 libpurple/protocols/silc/buddy.c             |   12 +-
 libpurple/protocols/silc/chat.c              |   10 +-
 libpurple/protocols/silc/ops.c               |    2 +-
 libpurple/protocols/silc/pk.c                |    2 +-
 libpurple/protocols/silc/silc.c              |    4 +-
 libpurple/protocols/silc/util.c              |    4 +-
 libpurple/protocols/silc/wb.c                |    2 +-
 libpurple/protocols/yahoo/libymsg.c          |   28 +-
 libpurple/protocols/yahoo/libymsg.h          |    2 +-
 libpurple/protocols/yahoo/yahoo_aliases.c    |    4 +-
 libpurple/prpl.c                             |   17 +
 libpurple/prpl.h                             |   26 +-
 libpurple/request.c                          |  591 ++++++++++++++++++--------
 libpurple/request.h                          |  490 +++++++++++++++-------
 libpurple/server.c                           |   10 +-
 pidgin/gtkaccount.c                          |   12 +-
 pidgin/gtkblist.c                            |   11 +-
 pidgin/gtkcertmgr.c                          |    8 +-
 pidgin/gtkconv.c                             |   11 +-
 pidgin/gtkdebug.c                            |    4 +-
 pidgin/gtkdialogs.c                          |   34 +-
 pidgin/gtkimhtmltoolbar.c                    |    2 +-
 pidgin/gtklog.c                              |    2 +-
 pidgin/gtkmedia.c                            |    9 +-
 pidgin/gtkplugin.c                           |   11 +-
 pidgin/gtkpounce.c                           |   11 +-
 pidgin/gtkprefs.c                            |    5 +-
 pidgin/gtkprivacy.c                          |   26 +-
 pidgin/gtkrequest.c                          |  458 ++++++++++++++------
 pidgin/gtksavedstatuses.c                    |    2 +-
 pidgin/gtkstatusbox.c                        |    2 +-
 pidgin/gtkutils.c                            |   33 +-
 pidgin/gtkwebviewtoolbar.c                   |   12 +-
 pidgin/pidginstock.c                         |    4 +-
 pidgin/pidginstock.h                         |    1 +
 pidgin/pixmaps/emotes/default/24/Makefile.am |    2 +-
 pidgin/pixmaps/emotes/none/Makefile.am       |    2 +-
 pidgin/pixmaps/emotes/small/16/Makefile.am   |    2 +-
 pidgin/plugins/disco/gtkdisco.c              |    2 +-
 pidgin/plugins/musicmessaging/Makefile.am    |    6 +-
 pidgin/plugins/perl/Makefile.am              |    5 +-
 102 files changed, 1565 insertions(+), 1018 deletions(-)

diffs (truncated from 5473 to 300 lines):

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,7 +70,11 @@ if ENABLE_GTK
 appsdir = $(datadir)/applications
 apps_in_files = pidgin.desktop.in
 apps_DATA = $(apps_in_files:.desktop.in=.desktop)
- at INTLTOOL_DESKTOP_RULE@
+
+# silenced INTLTOOL_DESKTOP_RULE
+%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
+	$(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ > /dev/null
+
 endif #ENABLE_GTK
 
 endif #INSTALL_I18N
diff --git a/autogen.sh b/autogen.sh
--- a/autogen.sh
+++ b/autogen.sh
@@ -151,7 +151,9 @@ run_or_die ${GLIB_GETTEXTIZE} ${GLIB_GET
 run_or_die ${INTLTOOLIZE} ${INTLTOOLIZE_FLAGS:-"-c -f --automake"}
 # This call to sed is needed to work around an annoying bug in intltool 0.40.6
 # See https://developer.pidgin.im/ticket/9520 for details
-run_or_die ${SED} -i.bak -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in
+run_or_die ${SED} -i -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in
+# glib-gettextize doesn't seems to use AM_V_GEN macro
+${SED} -i -e "s:\\tfile=\`echo:\\t at echo -e \"  GEN\\\\t\$\@\"; file=\`echo:g" po/Makefile.in.in
 run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"}
 run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS}
 run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS:-"-a -c --gnu"}
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -981,14 +981,14 @@ if test "x$enable_farstream" != "xno"; t
 		PKG_CHECK_MODULES(FARSTREAM, [farstream-0.2], [
 			AC_SUBST(FARSTREAM_CFLAGS)
 			AC_SUBST(FARSTREAM_LIBS)
- 		], [
+		], [
 		        enable_farstream="no"
 		])
 	else
 		PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
 			AC_SUBST(FARSTREAM_CFLAGS)
 			AC_SUBST(FARSTREAM_LIBS)
- 		], [
+		], [
 			# Try farsight.
 			PKG_CHECK_MODULES(FARSTREAM, [farsight2-0.10 >= 0.0.9], [
 			        AC_DEFINE(HAVE_FARSIGHT, 1, [Use Farsight instead of Farstream])
@@ -997,7 +997,7 @@ if test "x$enable_farstream" != "xno"; t
 			], [
 			        enable_farstream="no"
 			])
- 		])
+		])
 	fi
 fi
 
@@ -1484,7 +1484,7 @@ fi
 DEBUG_CPPFLAGS=`echo "$DEBUG_CFLAGS" | $sedpath 's/-Wdeclaration-after-statement//' | $sedpath 's/-Wmissing-prototypes//' | $sedpath 's/-Waggregate-return//'`
 
 if test "x$SUNCC" = "xyes"; then
-        CFLAGS="$CFLAGS -features=extensions" 
+        CFLAGS="$CFLAGS -features=extensions"
 fi
 AC_SUBST(CFLAGS)
 
diff --git a/finch/gntaccount.c b/finch/gntaccount.c
--- a/finch/gntaccount.c
+++ b/finch/gntaccount.c
@@ -719,10 +719,9 @@ delete_account_cb(GntWidget *widget, Gnt
 			purple_account_get_username(account));
 
 	purple_request_action(account, _("Delete Account"), prompt, NULL,
-						  PURPLE_DEFAULT_ACTION_NONE,
-						  account, NULL, NULL, account, 2,
-						  _("Delete"), really_delete_account,
-						  _("Cancel"), NULL);
+		PURPLE_DEFAULT_ACTION_NONE,
+		purple_request_cpar_from_account(account), account, 2,
+		_("Delete"), really_delete_account, _("Cancel"), NULL);
 	g_free(prompt);
 }
 
@@ -1014,12 +1013,11 @@ request_add(PurpleAccount *account, cons
 	data->alias    = (alias != NULL ? g_strdup(alias) : NULL);
 
 	buffer = make_info(account, gc, remote_user, id, alias, msg);
-	purple_request_action(NULL, NULL, _("Add buddy to your list?"),
-	                    buffer, PURPLE_DEFAULT_ACTION_NONE,
-						account, remote_user, NULL,
-						data, 2,
-	                    _("Add"),    G_CALLBACK(add_user_cb),
-	                    _("Cancel"), G_CALLBACK(free_add_user_data));
+	purple_request_action(NULL, NULL, _("Add buddy to your list?"), buffer,
+		PURPLE_DEFAULT_ACTION_NONE,
+		purple_request_cpar_from_account(account), data, 2,
+		_("Add"), G_CALLBACK(add_user_cb),
+		_("Cancel"), G_CALLBACK(free_add_user_data));
 	g_free(buffer);
 }
 
@@ -1104,7 +1102,7 @@ finch_request_authorize(PurpleAccount *a
 
 		widget = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL,
 			PURPLE_DEFAULT_ACTION_NONE,
-			account, remote_user, NULL,
+			purple_request_cpar_from_account(account),
 			aa, 2,
 			_("Authorize"), authorize_and_add_cb,
 			_("Deny"), deny_no_add_cb);
@@ -1131,7 +1129,7 @@ finch_request_authorize(PurpleAccount *a
 	} else {
 		uihandle = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL,
 			PURPLE_DEFAULT_ACTION_NONE,
-			account, remote_user, NULL,
+			purple_request_cpar_from_account(account),
 			user_data, 2,
 			_("Authorize"), auth_cb,
 			_("Deny"), deny_cb);
diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -699,7 +699,7 @@ finch_request_add_buddy(PurpleAccount *a
 			fields,
 			_("Add"), G_CALLBACK(add_buddy_cb),
 			_("Cancel"), NULL,
-			account, NULL, NULL,
+			purple_request_cpar_from_account(account),
 			NULL);
 }
 
@@ -805,8 +805,7 @@ finch_request_add_chat(PurpleAccount *ac
 	purple_request_fields(NULL, _("Add Chat"), NULL,
 			_("You can edit more information from the context menu later."),
 			fields, _("Add"), G_CALLBACK(add_chat_cb), _("Cancel"), NULL,
-			NULL, NULL, NULL,
-			NULL);
+			NULL, NULL);
 }
 
 static void
@@ -853,8 +852,7 @@ finch_request_add_group(void)
 	purple_request_input(NULL, _("Add Group"), NULL, _("Enter the name of the group"),
 			NULL, FALSE, FALSE, NULL,
 			_("Add"), G_CALLBACK(add_group_cb), _("Cancel"), NULL,
-			NULL, NULL, NULL,
-			NULL);
+			NULL, NULL);
 }
 
 static PurpleBlistUiOps blist_ui_ops =
@@ -1168,8 +1166,7 @@ chat_components_edit(PurpleBlistNode *se
 
 	purple_request_fields(NULL, _("Edit Chat"), NULL, _("Please Update the necessary fields."),
 			fields, _("Edit"), G_CALLBACK(chat_components_edit_ok), _("Cancel"), NULL,
-			NULL, NULL, NULL,
-			chat);
+			NULL, chat);
 }
 
 static void
@@ -1406,8 +1403,7 @@ finch_blist_rename_node_cb(PurpleBlistNo
 	purple_request_input(node, text, prompt, _("Enter empty string to reset the name."),
 			name, FALSE, FALSE, NULL, text, G_CALLBACK(rename_blist_node),
 			_("Cancel"), NULL,
-			NULL, NULL, NULL,
-			node);
+			NULL, node);
 
 	g_free(prompt);
 }
@@ -1536,7 +1532,7 @@ finch_blist_remove_node_cb(PurpleBlistNo
 	purple_request_action(node, _("Confirm Remove"),
 			primary, sec,
 			1,
-			account, name, NULL,
+			purple_request_cpar_from_account(account),
 			node, 2,
 			_("Remove"), finch_blist_remove_node,
 			_("Cancel"), NULL);
@@ -2672,7 +2668,7 @@ block_select_cb(gpointer data, PurpleReq
 	PurpleAccount *account = purple_request_fields_get_account(fields, "account");
 	const char *name = purple_request_fields_get_string(fields,  "screenname");
 	if (account && name && *name != '\0') {
-		if (purple_request_fields_get_choice(fields, "block") == 1) {
+		if (GPOINTER_TO_INT(purple_request_fields_get_choice(fields, "block")) == 1) {
 			purple_privacy_deny(account, name, FALSE, FALSE);
 		} else {
 			purple_privacy_allow(account, name, FALSE, FALSE);
@@ -2705,9 +2701,9 @@ block_select(GntMenuItem *item, gpointer
 	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	field = purple_request_field_choice_new("block", _("Block/Unblock"), 1);
-	purple_request_field_choice_add(field, _("Block"));
-	purple_request_field_choice_add(field, _("Unblock"));
+	field = purple_request_field_choice_new("block", _("Block/Unblock"), GINT_TO_POINTER(1));
+	purple_request_field_choice_add(field, _("Block"), GINT_TO_POINTER(1));
+	purple_request_field_choice_add(field, _("Unblock"), GINT_TO_POINTER(2));
 	purple_request_field_group_add_field(group, field);
 
 	purple_request_fields(purple_get_blist(), _("Block/Unblock"),
@@ -2717,8 +2713,7 @@ block_select(GntMenuItem *item, gpointer
 						fields,
 						_("OK"), G_CALLBACK(block_select_cb),
 						_("Cancel"), NULL,
-						NULL, NULL, NULL,
-						NULL);
+						NULL, NULL);
 }
 
 /* send_im_select* -- Xerox */
@@ -2768,8 +2763,7 @@ send_im_select(GntMenuItem *item, gpoint
 						fields,
 						_("OK"), G_CALLBACK(send_im_select_cb),
 						_("Cancel"), NULL,
-						NULL, NULL, NULL,
-						NULL);
+						NULL, NULL);
 }
 
 static void
@@ -2842,8 +2836,7 @@ join_chat_select(GntMenuItem *item, gpoi
 						fields,
 						_("Join"), G_CALLBACK(join_chat_select_cb),
 						_("Cancel"), NULL,
-						NULL, NULL, NULL,
-						NULL);
+						NULL, NULL);
 }
 
 static void
@@ -2904,8 +2897,7 @@ view_log_cb(GntMenuItem *item, gpointer 
 						fields,
 						_("OK"), G_CALLBACK(view_log_select_cb),
 						_("Cancel"), NULL,
-						NULL, NULL, NULL,
-						NULL);
+						NULL, NULL);
 }
 
 static void
diff --git a/finch/gntcertmgr.c b/finch/gntcertmgr.c
--- a/finch/gntcertmgr.c
+++ b/finch/gntcertmgr.c
@@ -89,8 +89,7 @@ tls_peers_mgmt_import_ok_cb(gpointer dat
 				default_hostname, FALSE, FALSE, NULL,
 				_("OK"), G_CALLBACK(tls_peers_mgmt_import_ok2_cb),
 				_("Cancel"), G_CALLBACK(tls_peers_mgmt_import_cancel2_cb),
-				NULL, NULL, NULL,
-				crt);
+				NULL, crt);
 		g_free(default_hostname);
 	} else {
 		gchar * secondary;
@@ -112,7 +111,7 @@ add_cert_cb(GntWidget *button, gpointer 
 			FALSE,
 			G_CALLBACK(tls_peers_mgmt_import_ok_cb),
 			NULL,
-			NULL, NULL, NULL, NULL );
+			NULL, NULL );
 }
 
 /* Save certs in some file */
@@ -160,8 +159,7 @@ save_cert_cb(GntWidget *button, gpointer
 			"certificate.pem", TRUE,
 			G_CALLBACK(tls_peers_mgmt_export_ok_cb),
 			G_CALLBACK(purple_certificate_destroy),
-			NULL, NULL, NULL,
-			crt);
+			NULL, crt);
 }
 
 /* Show information about a cert */
@@ -236,7 +234,7 @@ delete_cert_cb(GntWidget *button, gpoint
 	purple_request_yes_no((void *)key, _("Confirm certificate delete"),
 			primary, NULL,
 			0,
-			NULL, NULL, NULL,
+			NULL,
 			g_strdup(key),
 			tls_peers_mgmt_delete_confirm_cb,
 			g_free);
diff --git a/finch/gntconn.c b/finch/gntconn.c
--- a/finch/gntconn.c
+++ b/finch/gntconn.c
@@ -132,8 +132,7 @@ finch_connection_report_disconnect(Purpl
 				"correct the error and re-enable the account."), text);
 
 		purple_request_action(account, NULL, primary, secondary, 2,
-							account, NULL, NULL,
-							account, 3,
+			purple_request_cpar_from_account(account), account, 3,
 							_("OK"), NULL,
 							_("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb),
 							_("Re-enable Account"), PURPLE_CALLBACK(ce_enable_account_cb));
diff --git a/finch/gntplugin.c b/finch/gntplugin.c
--- a/finch/gntplugin.c



More information about the Commits mailing list