changeset 22504:a65a76072f31

merge of '058ee765cda4210b0bbd2e709b93a6e8bd956b21' and 'ff7de32106917f9d86c4f37b364c0fecd453c2ed'
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 17 Mar 2008 14:43:28 +0000
parents d536700e73e1 (current diff) 566a805a5bd4 (diff)
children 22fef6b952a0
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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),