* Output the account username instead of the display name in an error message
that causes the tests to fail because the account has no connection.
* Move all `g_assert_no_error` checks **BEFORE** we check the any other results
that we're checking. If we're not supposed to get an error and we have one,
that error helps us find the issue which therefore makes unit test failures
actionable instead of a message to debug.
Testing Done:
Compiled and made sure the tests pass.
Reviewed at https://reviews.imfreedom.org/r/326/
/* pidgin
*
* Pidgin is the legal property of its developers, whose names are too numerous
* to list here. Please refer to the COPYRIGHT file distributed with this
* source distribution.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*
*/
#ifdef HAVE_CONFIG_H
#include<config.h>
#endif
#include<glib/gi18n-lib.h>
#include<purple.h>
#include"gtkaccount.h"
#include"gtkblist.h"
#include"gtkconv.h"
#include"gtkdialogs.h"
#include"gtkxfer.h"
#include"gtkprivacy.h"
#include"gtkroomlist.h"
#include"gtkstatusbox.h"
#include"gtkscrollbook.h"
#include"gtkblist-theme.h"
#include"gtkblist-theme-loader.h"
#include"gtkutils.h"
#include"pidgin/minidialog.h"
#include"pidgin/pidginaccountchooser.h"
#include"pidgin/pidginaccountfilterconnected.h"
#include"pidgin/pidginaccountstore.h"
#include"pidgin/pidginactiongroup.h"
#include"pidgin/pidginbuddylistmenu.h"
#include"pidgin/pidgincellrendererexpander.h"
#include"pidgin/pidginclosebutton.h"
#include"pidgin/pidgincontactlist.h"
#include"pidgin/pidgincore.h"
#include"pidgin/pidgindebug.h"
#include"pidgin/pidgingdkpixbuf.h"
#include"pidgin/pidginlog.h"
#include"pidgin/pidginmooddialog.h"
#include"pidgin/pidginplugininfo.h"
#include"pidgin/pidginstyle.h"
#include"pidgin/pidgintooltip.h"
#include"pidgin/pidginwindow.h"
#include"pidginmenutray.h"
#include"pidginstock.h"
#include<gdk/gdkkeysyms.h>
#include<gtk/gtk.h>
#include<gdk/gdk.h>
typedefstruct
{
PurpleAccount*account;
GtkWidget*window;
GtkBox*vbox;
GtkWidget*account_menu;
GtkSizeGroup*sg;
}PidginBlistRequestData;
typedefstruct
{
PidginBlistRequestDatarq_data;
GtkWidget*combo;
GtkWidget*entry;
GtkWidget*entry_for_alias;
GtkWidget*entry_for_invite;
}PidginAddBuddyData;
typedefstruct
{
PidginBlistRequestDatarq_data;
gchar*default_chat_name;
GList*entries;
}PidginChatData;
typedefstruct
{
PidginChatDatachat_data;
GtkWidget*alias_entry;
GtkWidget*group_combo;
GtkWidget*autojoin;
GtkWidget*persistent;
}PidginAddChatData;
typedefstruct
{
/* GBoxed reference count */
intbox_count;
/* Used to hold error minidialogs. Gets packed
* inside PidginBuddyList.error_buttons
*/
PidginScrollBook*error_scrollbook;
/* Pointer to the mini-dialog about having signed on elsewhere, if one
char*msg=g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?","You currently have %d contacts named %s. Would you like to merge them?",i),i,alias);
purple_request_action(NULL,NULL,msg,_("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. "
"You can separate them again by choosing 'Expand' from the contact's context menu"),0,NULL,