pidgin.next.minor: bad28ed7: Kill unneeded GLIB_CHECK_VERSION uses in...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: bad28ed78c5293d41ca0e1f175ca7067f72d403f
Ancestor: 9d0624fe30a826b26606d2908052b5aa37fa0fb3
Author: rekkanoryo at pidgin.im
Date: 2009-08-22T22:08:21
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/bad28ed78c5293d41ca0e1f175ca7067f72d403f

Modified files:
        pidgin/gtkblist.c pidgin/gtkimhtml.c pidgin/gtkmain.c
        pidgin/pidginstock.c pidgin/win32/gtkdocklet-win32.c
        pidgin/win32/untar.c

ChangeLog: 

Kill unneeded GLIB_CHECK_VERSION uses in Pidgin.  Refs #10024.

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	62099ac72bbeddb9a5cc1bb7894a66dcd9a9c859
+++ pidgin/gtkblist.c	b550b988ad0e00a131d5f22049b84e65857219a9
@@ -5379,12 +5379,7 @@ headline_style_set (GtkWidget *widget,
 		return;
 
 	tooltips = gtk_tooltips_new ();
-#if GLIB_CHECK_VERSION(2,10,0)
 	g_object_ref_sink (tooltips);
-#else
-	g_object_ref(tooltips);
-	gtk_object_sink(GTK_OBJECT(tooltips));
-#endif
 
 	gtk_tooltips_force_window (tooltips);
 #if GTK_CHECK_VERSION(2, 12, 0)
============================================================
--- pidgin/gtkimhtml.c	c330c7a29eccf9fead311847c1ad32cfb762ae80
+++ pidgin/gtkimhtml.c	7a6090100db83d0291dd424c9d85c08910474242
@@ -3666,11 +3666,7 @@ image_save_yes_cb(GtkIMHtmlImageSave *sa
 	image->filesel = NULL;
 
 	if (save->data && save->datasize) {
-#if GLIB_CHECK_VERSION(2,8,0)
 		g_file_set_contents(filename, save->data, save->datasize, &error);
-#else
-		purple_util_write_data_to_file_absolute(filename, save->data, save->datasize);
-#endif
 	} else {
 		gchar *type = NULL;
 #if GTK_CHECK_VERSION(2,2,0)
============================================================
--- pidgin/gtkmain.c	f76d5bf2210a9dfccc64a3785f45be62b071d5e9
+++ pidgin/gtkmain.c	a7ca8a174a8ee40ad25da2dcc6968782ac945ec5
@@ -742,9 +742,7 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-#if GLIB_CHECK_VERSION(2,2,0)
 	g_set_application_name(_("Pidgin"));
-#endif /* glib-2.0 >= 2.2.0 */
 
 #ifdef _WIN32
 	winpidgin_init(hint);
============================================================
--- pidgin/pidginstock.c	d8955f561db529c7b3e497f7362658f98e7096fe
+++ pidgin/pidginstock.c	6a6a9f800a54f17abf5555f7eedba6dbacbb9711
@@ -239,7 +239,6 @@ find_file_common(const char *name)
 find_file_common(const char *name)
 {
 	gchar *filename;
-#if GLIB_CHECK_VERSION(2,6,0)
 	const gchar *userdir;
 	const gchar * const *sysdirs;
 
@@ -256,7 +255,6 @@ find_file_common(const char *name)
 			return filename;
 		g_free(filename);
 	}
-#endif
 	filename = g_build_filename(DATADIR, name, NULL);
 	if (g_file_test(filename, G_FILE_TEST_EXISTS))
 		return filename;
============================================================
--- pidgin/win32/gtkdocklet-win32.c	509bab4d7ca3f737da9a78580efd6306d28c9f03
+++ pidgin/win32/gtkdocklet-win32.c	cde08f62c5f0214f5cf42198c9419df8ade23c8b
@@ -585,12 +585,7 @@ static void winpidgin_tray_create() {
 			 G_CALLBACK(dummy_button_cb), NULL);
 
 	image = gtk_image_new();
-#if GLIB_CHECK_VERSION(2,10,0)
 	g_object_ref_sink(image);
-#else
-	g_object_ref(image);
-	gtk_object_sink(GTK_OBJECT(image));
-#endif
 
 	osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 	GetVersionEx(&osinfo);
============================================================
--- pidgin/win32/untar.c	ecb8277cf5ee35788236967717b64d4de9bf6389
+++ pidgin/win32/untar.c	eada085c61b9f12463d22561dc3e7f5b4be1c6fb
@@ -80,14 +80,7 @@
 #include "untar.h"
 #include <glib.h>
 
-#if GLIB_CHECK_VERSION(2,6,0)
-#	include <glib/gstdio.h>
-#else
-#define mkdir(a,b) _mkdir((a))
-#define g_mkdir mkdir
-#define g_fopen fopen
-#define g_unlink unlink
-#endif
+#include <glib/gstdio.h>
 
 #define untar_error( error, args... )      purple_debug(PURPLE_DEBUG_ERROR, "untar", error, ## args )
 #define untar_warning( warning, args... )  purple_debug(PURPLE_DEBUG_WARNING, "untar", warning, ## args )