can't use gtk_main_quit as a timeout function, since it doesn't return a

2005-11-30  Manish Singh  <yosh@gimp.org>

        * plug-ins/common/screenshot.c: can't use gtk_main_quit as a
        timeout function, since it doesn't return a value. Wrap it in a
        function that returns FALSE instead. Fixes bug #322343.
This commit is contained in:
Manish Singh 2005-11-30 08:01:04 +00:00 committed by Manish Singh
parent 72a3574bba
commit 72cc37aae3
2 changed files with 15 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2005-11-30 Manish Singh <yosh@gimp.org>
* plug-ins/common/screenshot.c: can't use gtk_main_quit as a
timeout function, since it doesn't return a value. Wrap it in a
function that returns FALSE instead. Fixes bug #322343.
2005-11-28 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/tools/gimprectangletool.c: handle fixed_width,

View file

@ -187,6 +187,7 @@ static gint32 shoot (GdkScreen *screen);
static gboolean shoot_dialog (GdkScreen **screen);
static void shoot_delay (gint32 delay);
static gboolean shoot_delay_callback (gpointer data);
static gboolean shoot_quit_timeout (gpointer data);
/* Global Variables */
@ -929,7 +930,7 @@ shoot_dialog (GdkScreen **screen)
/* A short timeout to give the server a chance to
* redraw the area that was obscured by our dialog.
*/
g_timeout_add (100, (GSourceFunc) gtk_main_quit, NULL);
g_timeout_add (100, shoot_quit_timeout, NULL);
gtk_main ();
if (shootvals.shoot_type != SHOOT_ROOT && ! shootvals.window_id)
@ -965,3 +966,10 @@ shoot_delay_callback (gpointer data)
return *seconds_left;
}
static gboolean
shoot_quit_timeout (gpointer data)
{
gtk_main_quit ();
return FALSE;
}