diff src/gtk/misc-gtk.c @ 41:4bcfaf6307b5

2002-10-29 Brian Masney <[e-mail]> * lib/config_file.c lib/gftp.h lib/options.h src/gtk/menu-items.c src/gtk/view_dialog.c - removed tmp_directory variable. Instead use g_get_tmp_dir () * lib/gftp.h (struct gftp_request) - added int cancel : 1 * lib/misc.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/ssh.c lib/sshv2.c - check for interrupted signal calls * lib/protocols.c - added gftp_fgets() and gftp_fwrite() functions * src/gtk/delete_dialog.c src/gtk/misc-gtk.c src/gtk/transfer.c - use g_main_context_iteration in GTK+ 2.0 port * src/gtk/misc-gtk.c - use g_object_unref instead of gdk_drawable_unref in GTK+ 2.0 port

--- a/src/gtk/misc-gtk.c	Fri Oct 18 02:53:52 2002 +0000
+++ b/src/gtk/misc-gtk.c	Wed Oct 30 02:53:21 2002 +0000
@@ -44,7 +44,12 @@
   while (ret)
     {
       GDK_THREADS_LEAVE ();
+#if GTK_MAJOR_VERSION == 1 && GTK_MINOR_VERSION == 2
       ret = g_main_iteration (FALSE);
+#else
+      ret = g_main_context_iteration (NULL, FALSE);
+#endif
+
     }
 }
 
@@ -420,8 +425,8 @@
   gdk_pixmap_unref (graphic->pixmap);
   gdk_bitmap_unref (graphic->bitmap);
 #else
-  gdk_drawable_unref (graphic->pixmap);
-  gdk_drawable_unref (graphic->bitmap);
+  g_object_unref (graphic->pixmap);
+  g_object_unref (graphic->bitmap);
 #endif
 
   g_hash_table_remove (graphic_hash_table, filename);
@@ -1137,7 +1142,11 @@
       while (wdata->request->stopable)
         {
           GDK_THREADS_LEAVE ();
+#if GTK_MAJOR_VERSION == 1 && GTK_MINOR_VERSION == 2
           g_main_iteration (TRUE);
+#else
+          g_main_context_iteration (NULL, TRUE);
+#endif
         }
 
       pthread_join (wdata->tid, &ret);