]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkapplication.c
Change FSF Address
[~andy/gtk] / gtk / gtkapplication.c
index 2722d0373f912e17fd0a52c69c7d5b92ca04f59f..c82577723712f590e6a5ad42044396d4def5e26d 100644 (file)
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 #include <string.h>
 
 #include "gtkapplicationprivate.h"
+#include "gtkclipboard.h"
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
+#include "gtkrecentmanager.h"
 #include "gtkaccelmapprivate.h"
 #include "gactionmuxer.h"
 #include "gtkintl.h"
@@ -40,7 +40,7 @@
 #include "gtkquartz-menu.h"
 #import <Cocoa/Cocoa.h>
 #include <Carbon/Carbon.h>
-#include <CoreServices/CoreServices.h>
+#include "gtkmessagedialog.h"
 #endif
 
 #include <gdk/gdk.h>
  * </example>
  *
  * GtkApplication optionally registers with a session manager
- * of the users session (if you set the #GtkApplication::register-session
+ * of the users session (if you set the #GtkApplication:register-session
  * property) and offers various functionality related to the session
  * life-cycle.
  *
- * An application can be informed when the session is about to end
- * by connecting to the #GtkApplication::quit signal.
- *
- * An application can request the session to be ended by calling
- * gtk_application_end_session().
- *
  * An application can block various ways to end the session with
  * the gtk_application_inhibit() function. Typical use cases for
  * this kind of inhibiting are long-running, uninterruptible operations,
 enum {
   WINDOW_ADDED,
   WINDOW_REMOVED,
-  QUIT,
   LAST_SIGNAL
 };
 
@@ -134,7 +127,9 @@ static guint gtk_application_signals[LAST_SIGNAL];
 
 enum {
   PROP_ZERO,
-  PROP_REGISTER_SESSION
+  PROP_REGISTER_SESSION,
+  PROP_APP_MENU,
+  PROP_MENUBAR
 };
 
 G_DEFINE_TYPE (GtkApplication, gtk_application, G_TYPE_APPLICATION)
@@ -145,9 +140,20 @@ struct _GtkApplicationPrivate
 
   gboolean register_session;
 
+  GMenuModel      *app_menu;
+  GMenuModel      *menubar;
+
 #ifdef GDK_WINDOWING_X11
   GDBusConnection *session_bus;
-  gchar *window_prefix;
+  const gchar     *application_id;
+  gchar           *object_path;
+
+  gchar           *app_menu_path;
+  guint            app_menu_id;
+
+  gchar           *menubar_path;
+  guint            menubar_id;
+
   guint next_id;
 
   GDBusProxy *sm_proxy;
@@ -160,15 +166,66 @@ struct _GtkApplicationPrivate
   GActionMuxer *muxer;
   GMenu *combined;
 
-  GHashTable *inhibitors;
-  gint quit_inhibited;
+  GSList *inhibitors;
+  gint quit_inhibit;
   guint next_cookie;
-  AppleEvent quit_event, quit_reply;
-  gboolean quitting;
 #endif
 };
 
 #ifdef GDK_WINDOWING_X11
+static void
+gtk_application_x11_publish_menu (GtkApplication  *application,
+                                  const gchar     *type,
+                                  GMenuModel      *model,
+                                  guint           *id,
+                                  gchar          **path)
+{
+  gint i;
+
+  /* unexport any existing menu */
+  if (*id)
+    {
+      g_dbus_connection_unexport_menu_model (application->priv->session_bus, *id);
+      g_free (*path);
+      *path = NULL;
+      *id = 0;
+    }
+
+  /* export the new menu, if there is one */
+  if (model != NULL)
+    {
+      /* try getting the preferred name */
+      *path = g_strconcat (application->priv->object_path, "/menus/", type, NULL);
+      *id = g_dbus_connection_export_menu_model (application->priv->session_bus, *path, model, NULL);
+
+      /* keep trying until we get a working name... */
+      for (i = 0; *id == 0; i++)
+        {
+          g_free (*path);
+          *path = g_strdup_printf ("%s/menus/%s%d", application->priv->object_path, type, i);
+          *id = g_dbus_connection_export_menu_model (application->priv->session_bus, *path, model, NULL);
+        }
+    }
+}
+
+static void
+gtk_application_set_app_menu_x11 (GtkApplication *application,
+                                  GMenuModel     *app_menu)
+{
+  gtk_application_x11_publish_menu (application, "appmenu", app_menu,
+                                    &application->priv->app_menu_id,
+                                    &application->priv->app_menu_path);
+}
+
+static void
+gtk_application_set_menubar_x11 (GtkApplication *application,
+                                 GMenuModel     *menubar)
+{
+  gtk_application_x11_publish_menu (application, "menubar", menubar,
+                                    &application->priv->menubar_id,
+                                    &application->priv->menubar_path);
+}
+
 static void
 gtk_application_window_added_x11 (GtkApplication *application,
                                   GtkWindow      *window)
@@ -192,7 +249,7 @@ gtk_application_window_added_x11 (GtkApplication *application,
           guint window_id;
 
           window_id = application->priv->next_id++;
-          window_path = g_strdup_printf ("%s%d", application->priv->window_prefix, window_id);
+          window_path = g_strdup_printf ("%s/window/%d", application->priv->object_path, window_id);
           success = gtk_application_window_publish (app_window, application->priv->session_bus, window_path);
           g_free (window_path);
         }
@@ -212,11 +269,11 @@ gtk_application_window_removed_x11 (GtkApplication *application,
 }
 
 static gchar *
-window_prefix_from_appid (const gchar *appid)
+object_path_from_appid (const gchar *appid)
 {
   gchar *appid_path, *iter;
 
-  appid_path = g_strconcat ("/", appid, "/windows/", NULL);
+  appid_path = g_strconcat ("/", appid, NULL);
   for (iter = appid_path; *iter; iter++)
     {
       if (*iter == '.')
@@ -238,7 +295,7 @@ gtk_application_startup_x11 (GtkApplication *application)
 
   application_id = g_application_get_application_id (G_APPLICATION (application));
   application->priv->session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-  application->priv->window_prefix = window_prefix_from_appid (application_id);
+  application->priv->object_path = object_path_from_appid (application_id);
 
   gtk_application_startup_session_dbus (GTK_APPLICATION (application));
 }
@@ -246,8 +303,8 @@ gtk_application_startup_x11 (GtkApplication *application)
 static void
 gtk_application_shutdown_x11 (GtkApplication *application)
 {
-  g_free (application->priv->window_prefix);
-  application->priv->window_prefix = NULL;
+  g_free (application->priv->object_path);
+  application->priv->object_path = NULL;
   g_clear_object (&application->priv->session_bus);
 
   g_clear_object (&application->priv->sm_proxy);
@@ -255,9 +312,44 @@ gtk_application_shutdown_x11 (GtkApplication *application)
   g_free (application->priv->app_id);
   g_free (application->priv->client_path);
 }
+
+const gchar *
+gtk_application_get_dbus_object_path (GtkApplication *application)
+{
+  return application->priv->object_path;
+}
+
+const gchar *
+gtk_application_get_app_menu_object_path (GtkApplication *application)
+{
+  return application->priv->app_menu_path;
+}
+
+const gchar *
+gtk_application_get_menubar_object_path (GtkApplication *application)
+{
+  return application->priv->menubar_path;
+}
+
 #endif
 
 #ifdef GDK_WINDOWING_QUARTZ
+
+typedef struct {
+  guint cookie;
+  GtkApplicationInhibitFlags flags;
+  char *reason;
+  GtkWindow *window;
+} GtkApplicationQuartzInhibitor;
+
+static void
+gtk_application_quartz_inhibitor_free (GtkApplicationQuartzInhibitor *inhibitor)
+{
+  g_free (inhibitor->reason);
+  g_clear_object (&inhibitor->window);
+  g_slice_free (GtkApplicationQuartzInhibitor, inhibitor);
+}
+
 static void
 gtk_application_menu_changed_quartz (GObject    *object,
                                      GParamSpec *pspec,
@@ -267,7 +359,7 @@ gtk_application_menu_changed_quartz (GObject    *object,
   GMenu *combined;
 
   combined = g_menu_new ();
-  g_menu_append_submenu (combined, "Application", g_application_get_app_menu (application));
+  g_menu_append_submenu (combined, "Application", gtk_application_get_app_menu (application));
   g_menu_append_section (combined, NULL, gtk_application_get_menubar (application));
 
   gtk_quartz_set_main_menu (G_MENU_MODEL (combined), G_ACTION_OBSERVABLE (application->priv->muxer));
@@ -298,7 +390,9 @@ gtk_application_shutdown_quartz (GtkApplication *application)
   g_object_unref (application->priv->muxer);
   application->priv->muxer = NULL;
 
-  g_hash_table_unref (application->priv->inhibitors);
+  g_slist_free_full (application->priv->inhibitors,
+                    (GDestroyNotify) gtk_application_quartz_inhibitor_free);
+  application->priv->inhibitors = NULL;
 }
 
 static void
@@ -363,6 +457,12 @@ gtk_application_shutdown (GApplication *application)
   gtk_application_shutdown_quartz (GTK_APPLICATION (application));
 #endif
 
+  /* Try storing all clipboard data we have */
+  _gtk_clipboard_store_all ();
+
+  /* Synchronize the recent manager singleton */
+  _gtk_recent_manager_sync ();
+
   G_APPLICATION_CLASS (gtk_application_parent_class)
     ->shutdown (application);
 }
@@ -518,26 +618,6 @@ extract_accels_from_menu (GMenuModel     *model,
     }
 }
 
-static void
-gtk_application_notify (GObject    *object,
-                        GParamSpec *pspec)
-{
-  if (strcmp (pspec->name, "app-menu") == 0 ||
-      strcmp (pspec->name, "menubar") == 0)
-    {
-      GMenuModel *model;
-      g_object_get (object, pspec->name, &model, NULL);
-      if (model)
-        {
-          extract_accels_from_menu (model, GTK_APPLICATION (object));
-          g_object_unref (model);
-        }
-    }
-
-  if (G_OBJECT_CLASS (gtk_application_parent_class)->notify)
-    G_OBJECT_CLASS (gtk_application_parent_class)->notify (object, pspec);
-}
-
 static void
 gtk_application_get_property (GObject    *object,
                               guint       prop_id,
@@ -552,6 +632,14 @@ gtk_application_get_property (GObject    *object,
       g_value_set_boolean (value, application->priv->register_session);
       break;
 
+    case PROP_APP_MENU:
+      g_value_set_object (value, gtk_application_get_app_menu (application));
+      break;
+
+    case PROP_MENUBAR:
+      g_value_set_object (value, gtk_application_get_menubar (application));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -572,6 +660,14 @@ gtk_application_set_property (GObject      *object,
       application->priv->register_session = g_value_get_boolean (value);
       break;
 
+    case PROP_APP_MENU:
+      gtk_application_set_app_menu (application, g_value_get_object (value));
+      break;
+
+    case PROP_MENUBAR:
+      gtk_application_set_menubar (application, g_value_get_object (value));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -579,10 +675,15 @@ gtk_application_set_property (GObject      *object,
 }
 
 static void
-gtk_application_quit (GtkApplication *app)
+gtk_application_finalize (GObject *object)
 {
-  /* we are asked to quit, so don't linger */
-  g_application_set_inactivity_timeout (G_APPLICATION (app), 0);
+  GtkApplication *application = GTK_APPLICATION (object);
+
+  g_clear_object (&application->priv->app_menu);
+  g_clear_object (&application->priv->menubar);
+
+  G_OBJECT_CLASS (gtk_application_parent_class)
+    ->finalize (object);
 }
 
 static void
@@ -593,7 +694,7 @@ gtk_application_class_init (GtkApplicationClass *class)
 
   object_class->get_property = gtk_application_get_property;
   object_class->set_property = gtk_application_set_property;
-  object_class->notify = gtk_application_notify;
+  object_class->finalize = gtk_application_finalize;
 
   application_class->add_platform_data = gtk_application_add_platform_data;
   application_class->before_emit = gtk_application_before_emit;
@@ -603,7 +704,6 @@ gtk_application_class_init (GtkApplicationClass *class)
 
   class->window_added = gtk_application_window_added;
   class->window_removed = gtk_application_window_removed;
-  class->quit = gtk_application_quit;
 
   g_type_class_add_private (class, sizeof (GtkApplicationPrivate));
 
@@ -643,37 +743,9 @@ gtk_application_class_init (GtkApplicationClass *class)
                   G_TYPE_NONE, 1, GTK_TYPE_WINDOW);
 
   /**
-   * GtkApplication::quit:
-   * @application: the #GtkApplication
-   *
-   * Emitted when the session manager wants the application to quit
-   * (generally because the user is logging out). The application
-   * should exit as soon as possible after receiving this signal; if
-   * it does not, the session manager may choose to forcibly kill it.
+   * GtkApplication:register-session:
    *
-   * Normally, an application would only be sent a ::quit if there
-   * are no inhibitors (see gtk_application_inhibit()).
-   * However, this is not guaranteed; in some situations the
-   * session manager may decide to end the session without giving
-   * applications a chance to object.
-   *
-   * To receive this signal, you need to set the
-   * #GtkApplication::register-session property
-   * when creating the application object.
-   *
-   * Since: 3.4
-   */
-  gtk_application_signals[QUIT] =
-    g_signal_new ("quit", GTK_TYPE_APPLICATION, G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (GtkApplicationClass, quit),
-                  NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-  /**
-   * GtkApplication::register-session:
-   *
-   * Set this property to %TRUE to register with the session manager
-   * and receive the #GtkApplication::quit signal when the session
-   * is about to end.
+   * Set this property to %TRUE to register with the session manager.
    *
    * Since: 3.4
    */
@@ -682,6 +754,20 @@ gtk_application_class_init (GtkApplicationClass *class)
                           P_("Register session"),
                           P_("Register with the session manager"),
                           FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (object_class, PROP_APP_MENU,
+    g_param_spec_object ("app-menu",
+                         P_("Application menu"),
+                         P_("The GMenuModel for the application menu"),
+                         G_TYPE_MENU_MODEL,
+                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  g_object_class_install_property (object_class, PROP_MENUBAR,
+    g_param_spec_object ("menubar",
+                         P_("Menubar"),
+                         P_("The GMenuModel for the menubar"),
+                         G_TYPE_MENU_MODEL,
+                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 }
 
 /**
@@ -694,10 +780,14 @@ gtk_application_class_init (GtkApplicationClass *class)
  * This function calls g_type_init() for you. gtk_init() is called
  * as soon as the application gets registered as the primary instance.
  *
+ * Concretely, gtk_init() is called in the default handler for the
+ * startup() signal. Therefore, #GtkApplication subclasses should
+ * chain up in their startup() handler before using any GTK+ API.
+ *
  * Note that commandline arguments are not passed to gtk_init().
  * All GTK+ functionality that is available via commandline arguments
  * can also be achieved by setting suitable environment variables
- * such as <envvar>G_DEBUG</envvar>, so this should not be a big
+ * such as <envar>G_DEBUG</envar>, so this should not be a big
  * problem. If you absolutely must support GTK+ commandline arguments,
  * you can explicitly call gtk_init() before creating the application
  * instance.
@@ -705,6 +795,8 @@ gtk_application_class_init (GtkApplicationClass *class)
  * The application id must be valid. See g_application_id_is_valid().
  *
  * Returns: a new #GtkApplication instance
+ *
+ * Since: 3.0
  */
 GtkApplication *
 gtk_application_new (const gchar       *application_id,
@@ -900,7 +992,7 @@ gtk_application_remove_accelerator (GtkApplication *application,
 /**
  * gtk_application_set_app_menu:
  * @application: a #GtkApplication
- * @model: (allow-none): a #GMenuModel, or %NULL
+ * @app_menu: (allow-none): a #GMenuModel, or %NULL
  *
  * Sets or unsets the application menu for @application.
  *
@@ -917,9 +1009,28 @@ gtk_application_remove_accelerator (GtkApplication *application,
  */
 void
 gtk_application_set_app_menu (GtkApplication *application,
-                              GMenuModel     *model)
+                              GMenuModel     *app_menu)
 {
-  g_object_set (application, "app-menu", model, NULL);
+  g_return_if_fail (GTK_IS_APPLICATION (application));
+
+  if (app_menu != application->priv->app_menu)
+    {
+      if (application->priv->app_menu != NULL)
+        g_object_unref (application->priv->app_menu);
+
+      application->priv->app_menu = app_menu;
+
+      if (application->priv->app_menu != NULL)
+        g_object_ref (application->priv->app_menu);
+
+      extract_accels_from_menu (app_menu, application);
+
+#ifdef GDK_WINDOWING_X11
+      gtk_application_set_app_menu_x11 (application, app_menu);
+#endif
+
+      g_object_notify (G_OBJECT (application), "app-menu");
+    }
 }
 
 /**
@@ -936,20 +1047,15 @@ gtk_application_set_app_menu (GtkApplication *application,
 GMenuModel *
 gtk_application_get_app_menu (GtkApplication *application)
 {
-  GMenuModel *app_menu = NULL;
-
-  g_object_get (application, "app-menu", &app_menu, NULL);
-
-  if (app_menu)
-    g_object_unref (app_menu);
+  g_return_val_if_fail (GTK_IS_APPLICATION (application), NULL);
 
-  return app_menu;
+  return application->priv->app_menu;
 }
 
 /**
  * gtk_application_set_menubar:
  * @application: a #GtkApplication
- * @model: (allow-none): a #GMenuModel, or %NULL
+ * @menubar: (allow-none): a #GMenuModel, or %NULL
  *
  * Sets or unsets the menubar for windows of @application.
  *
@@ -967,9 +1073,28 @@ gtk_application_get_app_menu (GtkApplication *application)
  */
 void
 gtk_application_set_menubar (GtkApplication *application,
-                             GMenuModel     *model)
+                             GMenuModel     *menubar)
 {
-  g_object_set (application, "menubar", model, NULL);
+  g_return_if_fail (GTK_IS_APPLICATION (application));
+
+  if (menubar != application->priv->menubar)
+    {
+      if (application->priv->menubar != NULL)
+        g_object_unref (application->priv->menubar);
+
+      application->priv->menubar = menubar;
+
+      if (application->priv->menubar != NULL)
+        g_object_ref (application->priv->menubar);
+
+      extract_accels_from_menu (menubar, application);
+
+#ifdef GDK_WINDOWING_X11
+      gtk_application_set_menubar_x11 (application, menubar);
+#endif
+
+      g_object_notify (G_OBJECT (application), "menubar");
+    }
 }
 
 /**
@@ -986,14 +1111,9 @@ gtk_application_set_menubar (GtkApplication *application,
 GMenuModel *
 gtk_application_get_menubar (GtkApplication *application)
 {
-  GMenuModel *menubar = NULL;
-
-  g_object_get (application, "menubar", &menubar, NULL);
-
-  if (menubar)
-    g_object_unref (menubar);
+  g_return_val_if_fail (GTK_IS_APPLICATION (application), NULL);
 
-  return menubar;
+  return application->priv->menubar;
 }
 
 #if defined(GDK_WINDOWING_X11)
@@ -1067,13 +1187,13 @@ client_proxy_signal (GDBusProxy     *proxy,
       g_debug ("Received EndSession");
       gtk_application_quit_response (app, TRUE, NULL);
       unregister_client (app);
-      g_signal_emit (app, gtk_application_signals[QUIT], 0);
+      g_application_quit (G_APPLICATION (app));
     }
   else if (strcmp (signal_name, "Stop") == 0)
     {
       g_debug ("Received Stop");
       unregister_client (app);
-      g_signal_emit (app, gtk_application_signals[QUIT], 0);
+      g_application_quit (G_APPLICATION (app));
     }
 }
 
@@ -1334,100 +1454,48 @@ gtk_application_is_inhibited (GtkApplication             *application,
   return inhibited;
 }
 
-/**
- * GtkApplicationEndSessionStyle:
- * @GTK_APPLICATION_LOGOUT: End the session by logging out
- * @GTK_APPLICATION_REBOOT: Restart the computer
- * @GTK_APPLICATION_SHUTDOWN: Shut the computer down
- *
- * Different ways to end a user session, for use with
- * gtk_application_end_session().
- */
-
-/**
- * gtk_application_end_session:
- * @application: the #GtkApplication
- * @style: the desired kind of session end
- * @request_confirmation: whether or not the user should get a chance
- *     to confirm the action
- *
- * Requests that the session manager end the current session.
- * @style indicates how the session should be ended, and
- * @request_confirmation indicates whether or not the user should be
- * given a chance to confirm the action. Both of these parameters are
- * merely hints though; the session manager may choose to ignore them.
- *
- * Return value: %TRUE if the request was sent; %FALSE if it could not
- *     be sent (eg, because it could not connect to the session manager)
- *
- * Since: 3.4
- */
-gboolean
-gtk_application_end_session (GtkApplication                *application,
-                             GtkApplicationEndSessionStyle  style,
-                             gboolean                       request_confirmation)
-{
-  g_return_val_if_fail (GTK_IS_APPLICATION (application), FALSE);
-  g_return_val_if_fail (!g_application_get_is_remote (G_APPLICATION (application)), FALSE);
-  g_return_val_if_fail (application->priv->sm_proxy != NULL, FALSE);
-
-  switch (style)
-    {
-    case GTK_APPLICATION_LOGOUT:
-      g_dbus_proxy_call (application->priv->sm_proxy,
-                         "Logout",
-                         g_variant_new ("(u)", request_confirmation ? 0 : 1),
-                         G_DBUS_CALL_FLAGS_NONE,
-                         G_MAXINT,
-                         NULL, NULL, NULL);
-      break;
-    case GTK_APPLICATION_REBOOT:
-    case GTK_APPLICATION_SHUTDOWN:
-      g_dbus_proxy_call (application->priv->sm_proxy,
-                         "Shutdown",
-                         NULL,
-                         G_DBUS_CALL_FLAGS_NONE,
-                         G_MAXINT,
-                         NULL, NULL, NULL);
-      break;
-    }
-
-  return TRUE;
-}
-
 #elif defined(GDK_WINDOWING_QUARTZ)
 
-/* OS X implementation copied from EggSMClient */
-
-static pascal OSErr
-quit_requested_resumed (const AppleEvent *aevt,
-                        AppleEvent       *reply,
-                        long              refcon)
-{
-  GtkApplication *app = GSIZE_TO_POINTER ((gsize)refcon);
-
-  return app->priv->quit_inhibit == 0 ? noErr : userCanceledErr;
-}
+/* OS X implementation copied from EggSMClient, but simplified since
+ * it doesn't need to interact with the user.
+ */
 
 static gboolean
 idle_will_quit (gpointer data)
 {
   GtkApplication *app = data;
 
-  /* Resume the event with a new handler that will return
-   * a value to the system
-   */
-  AEResumeTheCurrentEvent (&app->priv->quit_event, &app->priv->quit_reply,
-                           NewAEEventHandlerUPP (quit_requested_resumed),
-                           (long)GPOINTER_TO_SIZE (app));
-
-  AEDisposeDesc (&app->quit->quit_event);
-  AEDisposeDesc (&app->quit->quit_reply);
-
   if (app->priv->quit_inhibit == 0)
-    g_signal_emit (app, gtk_application_signals[QUIT], 0);
+    g_application_quit (G_APPLICATION (app));
+  else
+    {
+      GtkApplicationQuartzInhibitor *inhibitor;
+      GSList *iter;
+      GtkWidget *dialog;
+
+      for (iter = app->priv->inhibitors; iter; iter = iter->next)
+       {
+         inhibitor = iter->data;
+         if (inhibitor->flags & GTK_APPLICATION_INHIBIT_LOGOUT)
+           break;
+        }
+      g_assert (inhibitor != NULL);
+
+      dialog = gtk_message_dialog_new (inhibitor->window,
+                                      GTK_DIALOG_MODAL,
+                                      GTK_MESSAGE_ERROR,
+                                      GTK_BUTTONS_OK,
+                                      _("%s cannot quit at this time:\n\n%s"),
+                                      g_get_application_name (),
+                                      inhibitor->reason);
+      g_signal_connect_swapped (dialog,
+                                "response",
+                                G_CALLBACK (gtk_widget_destroy),
+                                dialog);
+      gtk_widget_show_all (dialog);
+    }
 
-  return FALSE;
+  return G_SOURCE_REMOVE;
 }
 
 static pascal OSErr
@@ -1437,17 +1505,12 @@ quit_requested (const AppleEvent *aevt,
 {
   GtkApplication *app = GSIZE_TO_POINTER ((gsize)refcon);
 
-  /* FIXME AEInteractWithUser? */
-  AEDuplicateDesc (aevt, &app->priv->quit_event);
-  AEDuplicateDesc (reply, &app->priv->quit_reply);
-  AESuspendTheCurrentEvent (aevt);
-
   /* Don't emit the "quit" signal immediately, since we're
    * called from a weird point in the guts of gdkeventloop-quartz.c
    */
-  g_idle_add (idle_will_quit, app);
+  g_idle_add_full (G_PRIORITY_DEFAULT, idle_will_quit, app, NULL);
 
-  return noErr;
+  return app->priv->quit_inhibit == 0 ? noErr : userCanceledErr;
 }
 
 static void
@@ -1457,8 +1520,6 @@ gtk_application_startup_session_quartz (GtkApplication *app)
     AEInstallEventHandler (kCoreEventClass, kAEQuitApplication,
                            NewAEEventHandlerUPP (quit_requested),
                            (long)GPOINTER_TO_SIZE (app), false);
-
-  app->priv->inhibitors = g_hash_table_new (NULL, NULL);
 }
 
 guint
@@ -1467,42 +1528,46 @@ gtk_application_inhibit (GtkApplication             *application,
                          GtkApplicationInhibitFlags  flags,
                          const gchar                *reason)
 {
-  guint cookie;
+  GtkApplicationQuartzInhibitor *inhibitor;
 
   g_return_val_if_fail (GTK_IS_APPLICATION (application), 0);
   g_return_val_if_fail (flags != 0, 0);
 
-  application->priv->next_cookie++;
-  cookie = application->priv->next_cookie;
+  inhibitor = g_slice_new (GtkApplicationQuartzInhibitor);
+  inhibitor->cookie = ++application->priv->next_cookie;
+  inhibitor->flags = flags;
+  inhibitor->reason = g_strdup (reason);
+  inhibitor->window = window ? g_object_ref (window) : NULL;
 
-  g_hash_table_insert (application->priv->inhibitors,
-                       GUINT_TO_POINTER (cookie),
-                       GUINT_TO_POINTER (flags));
+  application->priv->inhibitors = g_slist_prepend (application->priv->inhibitors, inhibitor);
 
   if (flags & GTK_APPLICATION_INHIBIT_LOGOUT)
     application->priv->quit_inhibit++;
 
-  return cookie;
+  return inhibitor->cookie;
 }
 
 void
 gtk_application_uninhibit (GtkApplication *application,
                            guint           cookie)
 {
-  GApplicationInhibitFlags flags;
-
-  flags = GPOINTER_TO_UINT (g_hash_table_lookup (application->priv->inhibitors, GUINT_TO_POINTER (cookie)));
+  GSList *iter;
 
-  if (flags == 0)
+  for (iter = application->priv->inhibitors; iter; iter = iter->next)
     {
-      g_warning ("Invalid inhibitor cookie");
-      return;
+      GtkApplicationQuartzInhibitor *inhibitor = iter->data;
+
+      if (inhibitor->cookie == cookie)
+       {
+         if (inhibitor->flags & GTK_APPLICATION_INHIBIT_LOGOUT)
+           application->priv->quit_inhibit--;
+         gtk_application_quartz_inhibitor_free (inhibitor);
+         application->priv->inhibitors = g_slist_delete_link (application->priv->inhibitors, iter);
+         return;
+       }
     }
 
-  g_hash_table_remove (application->priv->inhibitors, GUINT_TO_POINTER (cookie));
-
-  if (flags & GTK_APPLICATION_INHIBIT_LOGOUT)
-    application->priv->quit_inhibit--;
+  g_warning ("Invalid inhibitor cookie");
 }
 
 gboolean
@@ -1515,58 +1580,6 @@ gtk_application_is_inhibited (GtkApplication             *application,
   return FALSE;
 }
 
-gboolean
-gtk_application_end_session (GtkApplication         *application,
-                             GtkApplicationEndStyle *style,
-                             gboolean                request_confirmation)
-{
-  static const ProcessSerialNumber loginwindow_psn = { 0, kSystemProcess };
-  AppleEvent event = { typeNull, NULL };
-  AppleEvent reply = { typeNull, NULL };
-  AEAddressDesc target;
-  AEEventID id;
-  OSErr err;
-
-  switch (style)
-    {
-    case GTK_APPLICATION_LOGOUT:
-      id = request_confirmation ? kAELogOut : kAEReallyLogOut;
-      break;
-    case GTK_APPLICATION_REBOOT:
-      id = request_confirmation ? kAEShowRestartDialog : kAERestart;
-      break;
-    case GTK_APPLICATION_SHUTDOWN:
-      id = request_confirmation ? kAEShowShutdownDialog : kAEShutDown;
-      break;
-    }
-
-  err = AECreateDesc (typeProcessSerialNumber, &loginwindow_psn,
-                      sizeof (loginwindow_psn), &target);
-  if (err != noErr)
-    {
-      g_warning ("Could not create descriptor for loginwindow: %d", err);
-      return FALSE;
-    }
-
-  err = AECreateAppleEvent (kCoreEventClass, id, &target,
-                            kAutoGenerateReturnID, kAnyTransactionID,
-                            &event);
-  AEDisposeDesc (&target);
-  if (err != noErr)
-    {
-      g_warning ("Could not create logout AppleEvent: %d", err);
-      return FALSE;
-    }
-
-  err = AESend (&event, &reply, kAENoReply, kAENormalPriority,
-                kAEDefaultTimeout, NULL, NULL);
-  AEDisposeDesc (&event);
- if (err == noErr)
-    AEDisposeDesc (&reply);
-
-  return err == noErr;
-}
-
 #else
 
 /* Trivial implementation.
@@ -1597,12 +1610,4 @@ gtk_application_is_inhibited (GtkApplication             *application,
   return FALSE;
 }
 
-gboolean
-gtk_application_end_session (GtkApplication         *application,
-                             GtkApplicationEndStyle  style,
-                             gboolean                request_confirmation)
-{
-  return FALSE;
-}
-
 #endif