im.pidgin.pidgin: adb528a403db408f5e4407e89f98f7ced3cac9a1

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: adb528a403db408f5e4407e89f98f7ced3cac9a1
Ancestor: 37f061ef6d824b11d69828c2ca473760dbbcd387
Author: nosnilmot at pidgin.im
Date: 2007-12-18T15:56:06
Branch: im.pidgin.pidgin

Modified files:
        libpurple/ft.c libpurple/log.c
        libpurple/protocols/msn/soap.c pidgin/gtkimhtml.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkrequest.c
        pidgin/gtkutils.c

ChangeLog: 

Move some curly braces around so static analysis tools can properly detect
functions without having to preprocess the source

-------------- next part --------------
============================================================
--- libpurple/ft.c	7bea051811f74696389f383e4d63a47facc1ab77
+++ libpurple/ft.c	ba6fd83e4f984df254257d886e6c2b12291f2986
@@ -479,10 +479,11 @@ purple_xfer_request_accepted(PurpleXfer 
 		/* Sending a file */
 		/* Check the filename. */
 #ifdef _WIN32
-		if (g_strrstr(filename, "../") || g_strrstr(filename, "..\\")) {
+		if (g_strrstr(filename, "../") || g_strrstr(filename, "..\\"))
 #else
-		if (g_strrstr(filename, "../")) {
+		if (g_strrstr(filename, "../"))
 #endif
+		{
 			char *utf8 = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
 
 			msg = g_strdup_printf(_("%s is not a valid filename.\n"), utf8);
============================================================
--- libpurple/log.c	2ed5624583e7266fb26f4f82490e1808d5c0ec60
+++ libpurple/log.c	3dad12a18a307cd93938eead28850ef154763e23
@@ -348,7 +348,6 @@ PurpleLogLogger *purple_log_logger_new(c
 				void(*get_log_sets)(PurpleLogSetCallback cb, GHashTable *sets),
 				gboolean(*remove)(PurpleLog *log),
 				gboolean(*is_deletable)(PurpleLog *log))
-{
 #endif
 	PurpleLogLogger *logger;
 	va_list args;
============================================================
--- libpurple/protocols/msn/soap.c	30bd3c84691f3a1aabb84747d61096838a60d1c3
+++ libpurple/protocols/msn/soap.c	7ff6d18928808d87a0c0d0e538f528144e93e088
@@ -813,10 +813,8 @@ msn_soap_post(MsnSoapConn *soapconn, Msn
 		purple_debug_info("MSN SOAP", "Currently processing another SOAP request\n");
 	} else {
 		purple_debug_info("MSN SOAP", "No requests left to dispatch\n");
-	}
-#else
-      }
 #endif
+	}
 
 }
 
============================================================
--- pidgin/gtkimhtml.c	169b50512d2213a78c44d79ea1ab909c1d00decc
+++ pidgin/gtkimhtml.c	77011716826b9fb26d9fe51af1116328fa491d08
@@ -1136,14 +1136,13 @@ static void paste_clipboard_cb(GtkIMHtml
 #ifdef _WIN32
 	/* If we're on windows, let's see if we can get data from the HTML Format
 	   clipboard before we try to paste from the GTK buffer */
-	if (!clipboard_paste_html_win32(imhtml)) {
+	if (!clipboard_paste_html_win32(imhtml))
 #endif
+	{
 	GtkClipboard *clipboard = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD);
 	gtk_clipboard_request_contents(clipboard, gdk_atom_intern("text/html", FALSE),
 				       paste_received_cb, imhtml);
-#ifdef _WIN32
 	}
-#endif
 	g_signal_stop_emission_by_name(imhtml, "paste-clipboard");
 }
 
@@ -3483,6 +3482,9 @@ image_save_check_if_exists_cb(GtkWidget 
 		return;
 	}
 #endif /* FILECHOOSER */
+#if 0 /* mismatched curly braces */
+	}
+#endif
 
 	/*
 	 * XXX - We should probably prompt the user to determine if they really
============================================================
--- pidgin/gtkimhtmltoolbar.c	2c3063ed8ae196a084e0a378f0e539021d0d6818
+++ pidgin/gtkimhtmltoolbar.c	7cbcc533df65b7d1059748f2ab5e5e46ae48e958
@@ -467,10 +467,11 @@ do_insert_image_cb(GtkWidget *widget, in
 	GtkTextMark *ins;
 
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-	if (response != GTK_RESPONSE_ACCEPT) {
+	if (response != GTK_RESPONSE_ACCEPT)
 #else /* FILECHOOSER */
-	if (response != GTK_RESPONSE_OK) {
+	if (response != GTK_RESPONSE_OK)
 #endif /* FILECHOOSER */
+	{
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
 		return;
 	}
============================================================
--- pidgin/gtkrequest.c	243b33ea43778a5453f0054210d1ac61f5defe7e
+++ pidgin/gtkrequest.c	56e0643247b6d0e677315fff47b9517acc428f7d
@@ -1502,7 +1502,9 @@ file_ok_check_if_exists_cb(GtkWidget *bu
 	}
 
 #endif /* FILECHOOSER */
-
+#if 0 /* mismatched curly braces */
+	}
+#endif
 	if ((data->u.file.savedialog == TRUE) &&
 		(g_file_test(data->u.file.name, G_FILE_TEST_EXISTS))) {
 		purple_request_action(data, NULL, _("That file already exists"),
============================================================
--- pidgin/gtkutils.c	03ac004ec067a20f8ca29ff067b12c0b7e969dfb
+++ pidgin/gtkutils.c	dbafec83a4732f0eefcfb7163f93d51d77ea5b19
@@ -2306,6 +2306,9 @@ icon_filesel_choose_cb(GtkWidget *w, str
 	}
 
 #endif /* FILECHOOSER */
+#if 0 /* mismatched curly braces */
+	}
+#endif
 	if (dialog->callback)
 		dialog->callback(filename, dialog->data);
 	gtk_widget_destroy(dialog->icon_filesel);