Mercurial > pidgin.yaz
changeset 29477:99ab74fb312c
Kill unneeded GLIB_CHECK_VERSION uses in Pidgin. Refs #10024.
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sat, 22 Aug 2009 22:08:21 +0000 |
| parents | 39716f7d2c93 |
| children | 742307c4b95d |
| files | pidgin/gtkblist.c pidgin/gtkimhtml.c pidgin/gtkmain.c pidgin/pidginstock.c pidgin/win32/gtkdocklet-win32.c pidgin/win32/untar.c |
| diffstat | 6 files changed, 1 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Sat Aug 22 21:47:20 2009 +0000 +++ b/pidgin/gtkblist.c Sat Aug 22 22:08:21 2009 +0000 @@ -5379,12 +5379,7 @@ 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)
--- a/pidgin/gtkimhtml.c Sat Aug 22 21:47:20 2009 +0000 +++ b/pidgin/gtkimhtml.c Sat Aug 22 22:08:21 2009 +0000 @@ -3666,11 +3666,7 @@ 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)
--- a/pidgin/gtkmain.c Sat Aug 22 21:47:20 2009 +0000 +++ b/pidgin/gtkmain.c Sat Aug 22 22:08:21 2009 +0000 @@ -742,9 +742,7 @@ 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);
--- a/pidgin/pidginstock.c Sat Aug 22 21:47:20 2009 +0000 +++ b/pidgin/pidginstock.c Sat Aug 22 22:08:21 2009 +0000 @@ -239,7 +239,6 @@ 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 @@ return filename; g_free(filename); } -#endif filename = g_build_filename(DATADIR, name, NULL); if (g_file_test(filename, G_FILE_TEST_EXISTS)) return filename;
--- a/pidgin/win32/gtkdocklet-win32.c Sat Aug 22 21:47:20 2009 +0000 +++ b/pidgin/win32/gtkdocklet-win32.c Sat Aug 22 22:08:21 2009 +0000 @@ -585,12 +585,7 @@ 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);
--- a/pidgin/win32/untar.c Sat Aug 22 21:47:20 2009 +0000 +++ b/pidgin/win32/untar.c Sat Aug 22 22:08:21 2009 +0000 @@ -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 )