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

2002-10-29 Brian Masney <masneyb@gftp.org> * 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
author masneyb
date Wed, 30 Oct 2002 02:53:21 +0000
parents c8ec7877432e
children cd169e4789df
comparison
equal deleted inserted replaced
40:66c064fd05bc 41:4bcfaf6307b5
42 42
43 ret = 1; 43 ret = 1;
44 while (ret) 44 while (ret)
45 { 45 {
46 GDK_THREADS_LEAVE (); 46 GDK_THREADS_LEAVE ();
47 #if GTK_MAJOR_VERSION == 1 && GTK_MINOR_VERSION == 2
47 ret = g_main_iteration (FALSE); 48 ret = g_main_iteration (FALSE);
49 #else
50 ret = g_main_context_iteration (NULL, FALSE);
51 #endif
52
48 } 53 }
49 } 54 }
50 55
51 56
52 void 57 void
418 423
419 #if GTK_MAJOR_VERSION == 1 && GTK_MINOR_VERSION == 2 424 #if GTK_MAJOR_VERSION == 1 && GTK_MINOR_VERSION == 2
420 gdk_pixmap_unref (graphic->pixmap); 425 gdk_pixmap_unref (graphic->pixmap);
421 gdk_bitmap_unref (graphic->bitmap); 426 gdk_bitmap_unref (graphic->bitmap);
422 #else 427 #else
423 gdk_drawable_unref (graphic->pixmap); 428 g_object_unref (graphic->pixmap);
424 gdk_drawable_unref (graphic->bitmap); 429 g_object_unref (graphic->bitmap);
425 #endif 430 #endif
426 431
427 g_hash_table_remove (graphic_hash_table, filename); 432 g_hash_table_remove (graphic_hash_table, filename);
428 g_free (graphic->filename); 433 g_free (graphic->filename);
429 g_free (graphic); 434 g_free (graphic);
1135 pthread_create (&wdata->tid, NULL, func, wdata); 1140 pthread_create (&wdata->tid, NULL, func, wdata);
1136 1141
1137 while (wdata->request->stopable) 1142 while (wdata->request->stopable)
1138 { 1143 {
1139 GDK_THREADS_LEAVE (); 1144 GDK_THREADS_LEAVE ();
1145 #if GTK_MAJOR_VERSION == 1 && GTK_MINOR_VERSION == 2
1140 g_main_iteration (TRUE); 1146 g_main_iteration (TRUE);
1147 #else
1148 g_main_context_iteration (NULL, TRUE);
1149 #endif
1141 } 1150 }
1142 1151
1143 pthread_join (wdata->tid, &ret); 1152 pthread_join (wdata->tid, &ret);
1144 gtk_widget_set_sensitive (stop_btn, 0); 1153 gtk_widget_set_sensitive (stop_btn, 0);
1145 } 1154 }