camorama r346 - in trunk: . src

[herzi svn gnome org]

Author: herzi
Date: Wed May 28 11:43:42 2008
New Revision: 346
URL: http://svn.gnome.org/viewvc/camorama?rev=346&view=rev

Log:
2008-05-28  Sven Herzberg  <sven imendio com>

	properly manage the idle handler

	* src/camorama-window.c: (tray_clicked_callback): set the idle_id to 0
	if it's unset
	* src/main.c: (main): unset the idle handler after running the main
	loop


Modified:
   trunk/ChangeLog
   trunk/src/camorama-window.c
   trunk/src/main.c

Modified: trunk/src/camorama-window.c
==============================================================================
--- trunk/src/camorama-window.c	(original)
+++ trunk/src/camorama-window.c	Wed May 28 11:43:42 2008
@@ -163,7 +163,9 @@
             if (GTK_WIDGET_VISIBLE
                 (glade_xml_get_widget (cam->xml, "main_window"))) {
                 cam->hidden = TRUE;
+		// FIXME: connect the idle handler with the window's visibility
                 gtk_idle_remove (cam->idle_id);
+		cam->idle_id = 0;
                 gtk_widget_hide (glade_xml_get_widget
                                  (cam->xml, "main_window"));
             } else {

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Wed May 28 11:43:42 2008
@@ -285,5 +285,8 @@
 
     gtk_timeout_add (2000, (GSourceFunc) fps, cam->status);
     gtk_main ();
+
+    gtk_idle_remove (cam->idle_id);
+
     return 0;
 }