#include "gtkmain.h"
#include "gtkrecentmanager.h"
#include "gtkaccelmapprivate.h"
-#include "gactionmuxer.h"
#include "gtkintl.h"
#ifdef GDK_WINDOWING_QUARTZ
#include <gdk/x11/gdkx.h>
#endif
+extern void _gtk_accessibility_shutdown (void);
+
/**
* SECTION:gtkapplication
* @title: GtkApplication
gtk_application_set_app_menu_x11 (GtkApplication *application,
GMenuModel *app_menu)
{
- g_free (application->priv->app_menu_path);
gtk_application_x11_publish_menu (application, "appmenu", app_menu,
&application->priv->app_menu_id,
&application->priv->app_menu_path);
gtk_application_set_menubar_x11 (GtkApplication *application,
GMenuModel *menubar)
{
- g_free (application->priv->menubar_path);
gtk_application_x11_publish_menu (application, "menubar", menubar,
&application->priv->menubar_id,
&application->priv->menubar_path);
static void
gtk_application_shutdown_x11 (GtkApplication *application)
{
+ gtk_application_set_app_menu_x11 (application, NULL);
+ gtk_application_set_menubar_x11 (application, NULL);
+
application->priv->session_bus = NULL;
application->priv->object_path = NULL;
g_clear_object (&application->priv->client_proxy);
g_free (application->priv->app_id);
g_free (application->priv->client_path);
-
- g_free (application->priv->app_menu_path);
- g_free (application->priv->menubar_path);
}
const gchar *
gtk_application_shutdown_quartz (GTK_APPLICATION (application));
#endif
+ /* Keep this section in sync with gtk_main() */
+
/* Try storing all clipboard data we have */
_gtk_clipboard_store_all ();
/* Synchronize the recent manager singleton */
_gtk_recent_manager_sync ();
+ _gtk_accessibility_shutdown ();
+
G_APPLICATION_CLASS (gtk_application_parent_class)
->shutdown (application);
}
*
* Creates a new #GtkApplication instance.
*
- * This function calls g_type_init() for you. gtk_init() is called
- * as soon as the application gets registered as the primary instance.
+ * When using #GtkApplication, it is not necessary to call gtk_init()
+ * manually. It is called as soon as the application gets registered as
+ * the primary instance.
*
* Concretely, gtk_init() is called in the default handler for the
* #GApplication::startup signal. Therefore, #GtkApplication subclasses should
{
g_return_val_if_fail (application_id == NULL || g_application_id_is_valid (application_id), NULL);
- g_type_init ();
-
return g_object_new (GTK_TYPE_APPLICATION,
"application-id", application_id,
"flags", flags,
* @application: a #GtkApplication
* @id: an identifier number
*
- * Returns: (transfer none): the #GtkApplicationWindow with ID @id, or
+ * Returns the #GtkApplicationWindow with the given ID.
+ *
+ * Returns: (transfer none): the window with ID @id, or
* %NULL if there is no window with this ID
*
* Since: 3.6
GVariant *res;
GError *error = NULL;
guint cookie;
- guint xid;
+ guint xid = 0;
g_return_val_if_fail (GTK_IS_APPLICATION (application), 0);
g_return_val_if_fail (!g_application_get_is_remote (G_APPLICATION (application)), 0);
g_return_val_if_fail (application->priv->sm_proxy != NULL, 0);
if (window != NULL)
- xid = GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window)));
- else
- xid = 0;
+ {
+ GdkWindow *gdkwindow;
+
+ gdkwindow = gtk_widget_get_window (GTK_WIDGET (window));
+ if (gdkwindow == NULL)
+ g_warning ("Inhibit called with an unrealized window");
+ else
+ xid = GDK_WINDOW_XID (gdkwindow);
+ }
res = g_dbus_proxy_call_sync (application->priv->sm_proxy,
"Inhibit",