]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkapplication.c
Fix DND with frame sync
[~andy/gtk] / gtk / gtkapplication.c
index 4e9de420ed45122ad2d327da04f56500530a788b..9072907513ffb70707d19487a01e29b763adaed1 100644 (file)
@@ -289,12 +289,12 @@ gtk_application_startup_x11 (GtkApplication *application)
 static void
 gtk_application_shutdown_x11 (GtkApplication *application)
 {
-  application->priv->session_bus = NULL;
-  application->priv->object_path = NULL;
-
   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->sm_proxy);
   g_clear_object (&application->priv->client_proxy);
   g_free (application->priv->app_id);
@@ -768,8 +768,9 @@ gtk_application_class_init (GtkApplicationClass *class)
  *
  * 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
@@ -800,8 +801,6 @@ gtk_application_new (const gchar       *application_id,
 {
   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,
@@ -1419,16 +1418,22 @@ gtk_application_inhibit (GtkApplication             *application,
   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",