dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/widgets/gimpthumbbox.c libgimp/gimpprogressbar.c use Gtk functions to 

2007-05-16  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpthumbbox.c
	* libgimp/gimpprogressbar.c
	* plug-ins/script-fu/script-fu-interface.c: use Gtk functions to
	manually iterate the main loop because they release the Gdk lock
	correctly around calling the GLib main loop functions.


svn path=/trunk/; revision=22516
This commit is contained in:
Michael Natterer 2007-05-16 20:19:31 +00:00 committed by Michael Natterer
parent 8444fb1ecb
commit 8de797e0fa
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-05-16 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpthumbbox.c
* libgimp/gimpprogressbar.c
* plug-ins/script-fu/script-fu-interface.c: use Gtk functions to
manually iterate the main loop because they release the Gdk lock
correctly around calling the GLib main loop functions.
2007-05-16 Sven Neumann <sven@gimp.org>
* plug-ins/script-fu/script-fu-interface.c (script_fu_interface):

8
app/widgets/gimpthumbbox.c
View File

@ -598,8 +598,8 @@ gimp_thumb_box_create_thumbnails (GimpThumbBox *box,
gimp_progress_set_value (progress, 0.0);
while (g_main_context_pending (NULL))
g_main_context_iteration (NULL, FALSE);
while (gtk_events_pending ())
gtk_main_iteration ();
gimp_thumb_box_create_thumbnail (box,
list->data,
@ -619,8 +619,8 @@ gimp_thumb_box_create_thumbnails (GimpThumbBox *box,
gimp_progress_set_value (progress, 0.0);
while (g_main_context_pending (NULL))
g_main_context_iteration (NULL, FALSE);
while (gtk_events_pending ())
gtk_main_iteration ();
}
if (box->uris)

20
libgimp/gimpprogressbar.c
View File

@ -109,8 +109,8 @@ gimp_progress_bar_start (const gchar *message,
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
if (GTK_WIDGET_DRAWABLE (bar))
while (g_main_context_pending (NULL))
g_main_context_iteration (NULL, TRUE);
while (gtk_events_pending ())
gtk_main_iteration ();
}
static void
@ -122,8 +122,8 @@ gimp_progress_bar_end (gpointer user_data)
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
if (GTK_WIDGET_DRAWABLE (bar))
while (g_main_context_pending (NULL))
g_main_context_iteration (NULL, TRUE);
while (gtk_events_pending ())
gtk_main_iteration ();
}
static void
@ -135,8 +135,8 @@ gimp_progress_bar_set_text (const gchar *message,
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (bar), message ? message : " ");
if (GTK_WIDGET_DRAWABLE (bar))
while (g_main_context_pending (NULL))
g_main_context_iteration (NULL, TRUE);
while (gtk_events_pending ())
gtk_main_iteration ();
}
static void
@ -151,8 +151,8 @@ gimp_progress_bar_set_value (gdouble percentage,
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar));
if (GTK_WIDGET_DRAWABLE (bar))
while (g_main_context_pending (NULL))
g_main_context_iteration (NULL, TRUE);
while (gtk_events_pending ())
gtk_main_iteration ();
}
static void
@ -163,8 +163,8 @@ gimp_progress_bar_pulse (gpointer user_data)
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar));
if (GTK_WIDGET_DRAWABLE (bar))
while (g_main_context_pending (NULL))
g_main_context_iteration (NULL, TRUE);
while (gtk_events_pending ())
gtk_main_iteration ();
}
static GdkNativeWindow

4
plug-ins/script-fu/script-fu-interface.c
View File

@ -161,8 +161,8 @@ script_fu_interface_report_cc (const gchar *command)
}
}
while (g_main_context_pending (NULL))
g_main_context_iteration (NULL, TRUE);
while (gtk_events_pending ())
gtk_main_iteration ();
}
void