# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1205765008 0
# Node ID a65a76072f31e2e5438f0a9234073286b2008c44
# Parent  d536700e73e13aa2c7e4ece92b86bfdadbaa3eea# Parent  566a805a5bd466cc31a6ad3b956003e70b3f82ba
merge of '058ee765cda4210b0bbd2e709b93a6e8bd956b21'
     and 'ff7de32106917f9d86c4f37b364c0fecd453c2ed'

diff -r d536700e73e1 -r a65a76072f31 pidgin/minidialog.c
--- a/pidgin/minidialog.c	Mon Mar 17 14:39:03 2008 +0000
+++ b/pidgin/minidialog.c	Mon Mar 17 14:43:28 2008 +0000
@@ -51,7 +51,7 @@
 pidgin_mini_dialog_get_type (void)
 {
 	static GType g_define_type_id = 0;
-	if (G_UNLIKELY (g_define_type_id == 0))
+	if (g_define_type_id == 0)
 	{
 		static const GTypeInfo g_define_type_info = {
 			sizeof (PidginMiniDialogClass),