Remove timeout before exiting main loop
Also xfconf_shutdown() should be called last in main(), just as xfconf_init() is called first, so swap these two things. Fixes: #72
This commit is contained in:
@@ -103,7 +103,8 @@ static void
|
||||
destroy_window (void)
|
||||
{
|
||||
if (gtk_main_level () > 0) {
|
||||
xfconf_shutdown();
|
||||
if (timer_id > 0)
|
||||
g_source_remove (timer_id);
|
||||
gtk_main_quit ();
|
||||
}
|
||||
}
|
||||
@@ -113,7 +114,8 @@ delete_window (void)
|
||||
{
|
||||
if (!status_icon_get_visible ())
|
||||
{
|
||||
xfconf_shutdown();
|
||||
if (timer_id > 0)
|
||||
g_source_remove (timer_id);
|
||||
gtk_main_quit ();
|
||||
return FALSE;
|
||||
}
|
||||
@@ -271,8 +273,7 @@ int main (int argc, char *argv[])
|
||||
else
|
||||
g_warning ("Nothing to do: activate hiding to the notification area when using --start-hidden");
|
||||
|
||||
if (timer_id > 0)
|
||||
g_source_remove (timer_id);
|
||||
xfconf_shutdown();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user