callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkApplication: only allow quit_response when it make sense

Browse Source 
This check was present in the OS X implementation, but it
makes sense in the D-Bus implementation as well.
This commit is contained in:
Matthias Clasen
2012-01-07 20:01:23 -05:00
parent 00d5214695
commit f78696f3d0
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtkapplication.c
View File

@ -146,6 +146,7 @@ struct _GtkApplicationPrivate
GList *windows; GList *windows;
gboolean register_session; gboolean register_session;
gboolean quit_requested;
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
GDBusConnection *session_bus; GDBusConnection *session_bus;
@ -163,7 +164,7 @@ struct _GtkApplicationPrivate
GMenu *combined; GMenu *combined;
AppleEvent quit_event, quit_reply; AppleEvent quit_event, quit_reply;
gboolean quit_requested, quitting; gboolean quitting;
#endif #endif
}; };
@ -1026,6 +1027,8 @@ gtk_application_get_menubar (GtkApplication *application)
return menubar; return menubar;
} }
#if defined(GDK_WINDOWING_X11)
/* D-Bus Session Management /* D-Bus Session Management
* *
* The protocol and the D-Bus API are described here: * The protocol and the D-Bus API are described here:
@ -1033,23 +1036,6 @@ gtk_application_get_menubar (GtkApplication *application)
* http://people.gnome.org/~mccann/gnome-session/docs/gnome-session.html * http://people.gnome.org/~mccann/gnome-session/docs/gnome-session.html
*/ */
#ifdef GDK_WINDOWING_X11
/**
* GtkApplicationInhibitFlags:
* @GTK_APPLICATION_INHIBIT_LOGOUT: Inhibit logging out (including shutdown
* of the computer)
* @GTK_APPLICATION_INHIBIT_SWITCH: Inhibit user switching
* @GTK_APPLICATION_INHIBIT_SUSPEND: Inhibit suspending the
* session or computer
* @GTK_APPLICATION_INHIBIT_IDLE: Inhibit the session being
* marked as idle (and possibly locked)
*
* Types of user actions that may be blocked by gtk_application_inhibit().
*
* Since: 3.4
*/
static void static void
unregister_client (GtkApplication *app) unregister_client (GtkApplication *app)
{ {
@ -1087,6 +1073,7 @@ client_proxy_signal (GDBusProxy *proxy,
if (strcmp (signal_name, "QueryEndSession") == 0) if (strcmp (signal_name, "QueryEndSession") == 0)
{ {
g_debug ("Received QueryEndSession"); g_debug ("Received QueryEndSession");
app->priv->quit_requested = TRUE;
g_signal_emit (app, gtk_application_signals[QUIT_REQUESTED], 0); g_signal_emit (app, gtk_application_signals[QUIT_REQUESTED], 0);
} }
else if (strcmp (signal_name, "EndSession") == 0) else if (strcmp (signal_name, "EndSession") == 0)
@ -1231,6 +1218,9 @@ gtk_application_quit_response (GtkApplication *application,
g_return_if_fail (GTK_IS_APPLICATION (application)); g_return_if_fail (GTK_IS_APPLICATION (application));
g_return_if_fail (!g_application_get_is_remote (G_APPLICATION (application))); g_return_if_fail (!g_application_get_is_remote (G_APPLICATION (application)));
g_return_if_fail (application->priv->client_proxy != NULL); g_return_if_fail (application->priv->client_proxy != NULL);
g_return_if_fail (application->priv->quit_requested);
application->priv->quit_requested = FALSE;
g_debug ("Calling EndSessionResponse %d '%s'", will_quit, reason); g_debug ("Calling EndSessionResponse %d '%s'", will_quit, reason);
@ -1242,6 +1232,21 @@ gtk_application_quit_response (GtkApplication *application,
NULL, NULL, NULL); NULL, NULL, NULL);
} }
/**
* GtkApplicationInhibitFlags:
* @GTK_APPLICATION_INHIBIT_LOGOUT: Inhibit logging out (including shutdown
* of the computer)
* @GTK_APPLICATION_INHIBIT_SWITCH: Inhibit user switching
* @GTK_APPLICATION_INHIBIT_SUSPEND: Inhibit suspending the
* session or computer
* @GTK_APPLICATION_INHIBIT_IDLE: Inhibit the session being
* marked as idle (and possibly locked)
*
* Types of user actions that may be blocked by gtk_application_inhibit().
*
* Since: 3.4
*/
/** /**
* gtk_application_inhibit: * gtk_application_inhibit:
* @application: the #GApplication * @application: the #GApplication