/soc/2013/bhaskar/plugins-window: 52e97a092f4e: Pulled in latest...
Bhaskar Kandiyal
bkandiyal at gmail.com
Tue Sep 17 17:09:13 EDT 2013
Changeset: 52e97a092f4ecf47ecdbcad08ace1c66adcba68d
Author: Bhaskar Kandiyal <bkandiyal at gmail.com>
Date: 2013-09-18 02:36 +0530
Branch: default
URL: https://hg.pidgin.im/soc/2013/bhaskar/plugins-window/rev/52e97a092f4e
Description:
Pulled in latest changes from main
diffstat:
Makefile.am | 6 +-
autogen.sh | 4 +-
configure.ac | 19 +-
finch/gntaccount.c | 25 +-
finch/gntblist.c | 36 +-
finch/gntcertmgr.c | 10 +-
finch/gntconn.c | 3 +-
finch/gntdebug.c | 1 +
finch/gntplugin.c | 5 +-
finch/gntpounce.c | 3 +-
finch/gntprefs.c | 5 +-
finch/gntrequest.c | 60 +-
finch/gntstatus.c | 3 +-
finch/libgnt/Makefile.am | 8 +-
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 +-
finch/plugins/gnthistory.c | 2 +-
libpurple/Makefile.am | 2 +
libpurple/Makefile.mingw | 2 +
libpurple/account.c | 35 +-
libpurple/account.h | 2 +-
libpurple/cipher.c | 7 +-
libpurple/ciphers/aes.c | 4 +-
libpurple/ciphers/des.c | 42 +-
libpurple/ciphers/gchecksum.c | 5 +-
libpurple/ciphers/hmac.c | 2 +-
libpurple/ciphers/pbkdf2.c | 2 +-
libpurple/circbuffer.c | 10 +-
libpurple/conversation.c | 31 +-
libpurple/conversation.h | 12 +
libpurple/dnsquery.c | 6 +-
libpurple/dnssrv.c | 2 +-
libpurple/ft.c | 47 +-
libpurple/gconf/Makefile.am | 5 +-
libpurple/http.c | 238 +----
libpurple/media/backend-fs2.c | 2 +-
libpurple/plugins/Makefile.am | 6 +-
libpurple/plugins/autoaccept.c | 12 +-
libpurple/plugins/buddynote.c | 3 +-
libpurple/plugins/idle.c | 9 +-
libpurple/plugins/joinpart.c | 2 +-
libpurple/plugins/keyrings/internalkeyring.c | 4 +-
libpurple/plugins/offlinemsg.c | 3 +-
libpurple/plugins/perl/Makefile.am | 8 +-
libpurple/plugins/perl/common/Makefile.PL.in | 2 +-
libpurple/plugins/perl/common/Request.xs | 45 +-
libpurple/plugins/perl/perl-handlers.h | 4 +-
libpurple/plugins/signals-test.c | 2 +-
libpurple/plugins/ssl/ssl-gnutls.c | 4 +-
libpurple/plugins/tcl/tcl_purple.h | 2 +-
libpurple/plugins/tcl/tcl_ref.c | 4 +-
libpurple/protocols/bonjour/bonjour.c | 9 +-
libpurple/protocols/gg/Makefile.am | 77 +-
libpurple/protocols/gg/Makefile.mingw | 12 +-
libpurple/protocols/gg/account.c | 4 +-
libpurple/protocols/gg/account.h | 2 +-
libpurple/protocols/gg/avatar.c | 29 +-
libpurple/protocols/gg/chat.c | 619 +++++++++++++
libpurple/protocols/gg/chat.h | 34 +
libpurple/protocols/gg/confer.c | 170 ---
libpurple/protocols/gg/confer.h | 93 --
libpurple/protocols/gg/edisc.c | 1180 ++++++++++++++++++++++++++
libpurple/protocols/gg/edisc.h | 22 +
libpurple/protocols/gg/gg.c | 809 ++++-------------
libpurple/protocols/gg/gg.h | 38 +-
libpurple/protocols/gg/html.c | 158 +++
libpurple/protocols/gg/html.h | 32 +
libpurple/protocols/gg/image.c | 327 ++++---
libpurple/protocols/gg/image.h | 21 +-
libpurple/protocols/gg/libgadu-events.c | 49 +-
libpurple/protocols/gg/libgadu-events.h | 6 +
libpurple/protocols/gg/libgaduw.c | 69 +
libpurple/protocols/gg/libgaduw.h | 6 +-
libpurple/protocols/gg/message-prpl.c | 806 +++++++++++++++++
libpurple/protocols/gg/message-prpl.h | 22 +
libpurple/protocols/gg/multilogon.c | 12 +-
libpurple/protocols/gg/multilogon.h | 1 -
libpurple/protocols/gg/pubdir-prpl.c | 75 +-
libpurple/protocols/gg/purplew.c | 18 +-
libpurple/protocols/gg/roster.c | 2 +-
libpurple/protocols/gg/servconn.c | 6 +-
libpurple/protocols/gg/status.c | 24 +-
libpurple/protocols/gg/tcpsocket.c | 115 ++
libpurple/protocols/gg/tcpsocket.h | 13 +
libpurple/protocols/gg/utils.c | 68 +-
libpurple/protocols/gg/utils.h | 21 +-
libpurple/protocols/irc/irc.c | 11 +-
libpurple/protocols/irc/parse.c | 2 +-
libpurple/protocols/jabber/Makefile.am | 4 +-
libpurple/protocols/jabber/auth.c | 2 +-
libpurple/protocols/jabber/auth_cyrus.c | 2 +-
libpurple/protocols/jabber/auth_plain.c | 2 +-
libpurple/protocols/jabber/auth_scram.c | 2 +-
libpurple/protocols/jabber/buddy.c | 9 +-
libpurple/protocols/jabber/chat.c | 2 +-
libpurple/protocols/jabber/jabber.c | 45 +-
libpurple/protocols/jabber/jutil.c | 10 +-
libpurple/protocols/jabber/libfacebook.c | 3 +-
libpurple/protocols/jabber/libgtalk.c | 3 +-
libpurple/protocols/jabber/libxmpp.c | 3 +-
libpurple/protocols/jabber/presence.c | 4 +-
libpurple/protocols/jabber/si.c | 19 +-
libpurple/protocols/jabber/usernick.c | 2 +-
libpurple/protocols/jabber/xdata.c | 13 +-
libpurple/protocols/msn/command.c | 2 +-
libpurple/protocols/msn/command.h | 2 +-
libpurple/protocols/msn/directconn.c | 6 +-
libpurple/protocols/msn/error.c | 2 +-
libpurple/protocols/msn/history.c | 2 +-
libpurple/protocols/msn/msn.c | 32 +-
libpurple/protocols/msn/nexus.c | 8 +-
libpurple/protocols/msn/nexus.h | 2 +-
libpurple/protocols/msn/notification.c | 4 +-
libpurple/protocols/msn/p2p.c | 4 +-
libpurple/protocols/msn/servconn.c | 7 +-
libpurple/protocols/msn/slplink.c | 4 +-
libpurple/protocols/msn/slpmsg.h | 2 +-
libpurple/protocols/msn/slpmsg_part.c | 2 +-
libpurple/protocols/msn/tlv.c | 2 +-
libpurple/protocols/msn/transaction.c | 2 +-
libpurple/protocols/msn/transaction.h | 2 +-
libpurple/protocols/msn/userlist.c | 3 +-
libpurple/protocols/mxit/actions.c | 12 +-
libpurple/protocols/mxit/login.c | 15 +-
libpurple/protocols/mxit/mxit.c | 3 +-
libpurple/protocols/mxit/splashscreen.c | 4 +-
libpurple/protocols/myspace/myspace.c | 15 +-
libpurple/protocols/myspace/persist.h | 4 +-
libpurple/protocols/myspace/user.c | 18 +-
libpurple/protocols/novell/nmrtf.c | 2 +-
libpurple/protocols/novell/novell.c | 12 +-
libpurple/protocols/null/nullprpl.c | 3 +-
libpurple/protocols/oscar/bstream.c | 7 +-
libpurple/protocols/oscar/family_feedbag.c | 2 +-
libpurple/protocols/oscar/libaim.c | 3 +-
libpurple/protocols/oscar/libicq.c | 10 +-
libpurple/protocols/oscar/oscar.c | 25 +-
libpurple/protocols/oscar/oscar.h | 8 +-
libpurple/protocols/oscar/oscarcommon.h | 1 +
libpurple/protocols/oscar/peer.c | 2 +-
libpurple/protocols/oscar/tlv.c | 6 +-
libpurple/protocols/oscar/util.c | 2 +-
libpurple/protocols/sametime/sametime.c | 15 +-
libpurple/protocols/silc/buddy.c | 14 +-
libpurple/protocols/silc/chat.c | 32 +-
libpurple/protocols/silc/ops.c | 4 +-
libpurple/protocols/silc/pk.c | 4 +-
libpurple/protocols/silc/silc.c | 7 +-
libpurple/protocols/silc/util.c | 4 +-
libpurple/protocols/silc/wb.c | 2 +-
libpurple/protocols/simple/simple.c | 3 +-
libpurple/protocols/yahoo/libyahoo.c | 3 +-
libpurple/protocols/yahoo/libyahoojp.c | 3 +-
libpurple/protocols/yahoo/libymsg.c | 30 +-
libpurple/protocols/yahoo/libymsg.h | 3 +-
libpurple/protocols/yahoo/util.c | 4 +-
libpurple/protocols/yahoo/yahoo_aliases.c | 4 +-
libpurple/protocols/yahoo/yahoo_packet.c | 4 +-
libpurple/protocols/yahoo/yahoo_packet.h | 2 +-
libpurple/protocols/yahoo/ycht.c | 2 +-
libpurple/protocols/zephyr/ZReadAscii.c | 2 +-
libpurple/protocols/zephyr/ZVariables.c | 2 +-
libpurple/protocols/zephyr/Zinternal.c | 4 +-
libpurple/protocols/zephyr/internal.h | 2 +-
libpurple/protocols/zephyr/zephyr.c | 9 +-
libpurple/proxy.c | 6 +-
libpurple/prpl.c | 17 +
libpurple/prpl.h | 31 +
libpurple/purple-client.c | 4 +-
libpurple/purple-socket.c | 354 +++++++
libpurple/purple-socket.h | 200 ++++
libpurple/request.c | 671 +++++++++++---
libpurple/request.h | 544 ++++++++---
libpurple/server.c | 10 +-
libpurple/stun.c | 10 +-
libpurple/tag.sh | 6 +
libpurple/upnp.c | 10 +-
libpurple/util.c | 26 +-
libpurple/xmlnode.c | 4 +-
pidgin/gtkaccount.c | 15 +-
pidgin/gtkblist.c | 11 +-
pidgin/gtkcertmgr.c | 8 +-
pidgin/gtkconv.c | 15 +-
pidgin/gtkdebug.c | 6 +-
pidgin/gtkdialogs.c | 34 +-
pidgin/gtkft.c | 4 +-
pidgin/gtkimhtml.c | 2 +-
pidgin/gtkimhtmltoolbar.c | 2 +-
pidgin/gtklog.c | 2 +-
pidgin/gtkmain.c | 2 +-
pidgin/gtkmedia.c | 9 +-
pidgin/gtkplugin.c | 11 +-
pidgin/gtkpounce.c | 11 +-
pidgin/gtkprefs.c | 7 +-
pidgin/gtkprivacy.c | 41 +-
pidgin/gtkrequest.c | 530 ++++++++---
pidgin/gtksavedstatuses.c | 2 +-
pidgin/gtkstatusbox.c | 8 +-
pidgin/gtkthemes.c | 2 +-
pidgin/gtkutils.c | 37 +-
pidgin/gtkwebview.c | 4 +-
pidgin/gtkwebviewtoolbar.c | 16 +-
pidgin/pidginstock.c | 8 +-
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 +-
pidgin/plugins/perl/common/Makefile.PL.in | 2 +-
pidgin/plugins/pidginrc.c | 10 +-
pidgin/plugins/spellchk.c | 11 +-
valgrind-suppressions | 69 +
220 files changed, 6530 insertions(+), 2539 deletions(-)
diffs (truncated from 15145 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
@@ -1424,21 +1424,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" \
@@ -1446,6 +1438,7 @@ if test "x$GCC" = "xyes"; then
"-Wmissing-noreturn" \
"-Wmissing-prototypes" \
"-Wpointer-arith" \
+ "-Wfloat-equal" \
"-Wundef" \
; do
orig_CFLAGS="$CFLAGS"
@@ -1491,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);
}
@@ -765,7 +764,8 @@ account_list_key_pressed_cb(GntWidget *w
count = g_list_length(accounts);
pos = g_list_index(accounts, account);
pos = (move + pos + count + 1) % (count + 1);
- purple_accounts_reorder(account, pos);
+ if (pos >= 0)
+ purple_accounts_reorder(account, pos);
/* I don't like this, but recreating the entire list seems to be
* the easiest way of doing it */
@@ -1013,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);
}
@@ -1103,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);
@@ -1130,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,
More information about the Commits
mailing list