[gimp] app: Remove transient-docks gimprc setting

[Martin Nordholts <martinn src gnome org>]

commit c6818c5710ac14f6826d62d04099758952a0ff6b
Author: Martin Nordholts <martinn src gnome org>
Date:   Tue Jul 21 16:38:00 2009 +0200

    app: Remove transient-docks gimprc setting
    
    Remove the transient-docks setting for gimprc. What GIMP tried to
    accomplish with this enabled is much better accomplished by the window
    manager with the docks set to the 'Utility window' window hint. See
    discussion in bug #322577.

 app/config/gimpguiconfig.c       |   21 +++++++---------
 app/config/gimpguiconfig.h       |    1 -
 app/config/gimprc-blurbs.h       |    6 -----
 app/dialogs/preferences-dialog.c |    7 -----
 app/widgets/gimpimagedock.c      |   47 --------------------------------------
 5 files changed, 9 insertions(+), 73 deletions(-)
---
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
index 2af33b3..99c4b8a 100644
--- a/app/config/gimpguiconfig.c
+++ b/app/config/gimpguiconfig.c
@@ -81,14 +81,14 @@ enum
   PROP_USER_MANUAL_ONLINE_URI,
   PROP_TOOLBOX_WINDOW_HINT,
   PROP_DOCK_WINDOW_HINT,
-  PROP_TRANSIENT_DOCKS,
   PROP_CURSOR_FORMAT,
 
   /* ignored, only for backward compatibility: */
   PROP_INFO_WINDOW_PER_DISPLAY,
   PROP_MENU_MNEMONICS,
   PROP_SHOW_TOOL_TIPS,
-  PROP_SHOW_TIPS
+  PROP_SHOW_TIPS,
+  PROP_TRANSIENT_DOCKS
 };
 
 
@@ -264,10 +264,6 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
                                  GIMP_WINDOW_HINT_UTILITY,
                                  GIMP_PARAM_STATIC_STRINGS |
                                  GIMP_CONFIG_PARAM_RESTART);
-  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TRANSIENT_DOCKS,
-                                    "transient-docks", TRANSIENT_DOCKS_BLURB,
-                                    FALSE,
-                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_CURSOR_FORMAT,
                                  "cursor-format", CURSOR_FORMAT_BLURB,
                                  GIMP_TYPE_CURSOR_FORMAT,
@@ -296,6 +292,11 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS |
                                     GIMP_CONFIG_PARAM_IGNORE);
+  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TRANSIENT_DOCKS,
+                                    "transient-docks", NULL,
+                                    FALSE,
+                                    GIMP_PARAM_STATIC_STRINGS |
+                                    GIMP_CONFIG_PARAM_IGNORE);
 }
 
 static void
@@ -422,9 +423,6 @@ gimp_gui_config_set_property (GObject      *object,
     case PROP_DOCK_WINDOW_HINT:
       gui_config->dock_window_hint = g_value_get_enum (value);
       break;
-    case PROP_TRANSIENT_DOCKS:
-      gui_config->transient_docks = g_value_get_boolean (value);
-      break;
     case PROP_CURSOR_FORMAT:
       gui_config->cursor_format = g_value_get_enum (value);
       break;
@@ -433,6 +431,7 @@ gimp_gui_config_set_property (GObject      *object,
     case PROP_MENU_MNEMONICS:
     case PROP_SHOW_TOOL_TIPS:
     case PROP_SHOW_TIPS:
+    case PROP_TRANSIENT_DOCKS:
       /* ignored */
       break;
 
@@ -542,9 +541,6 @@ gimp_gui_config_get_property (GObject    *object,
     case PROP_DOCK_WINDOW_HINT:
       g_value_set_enum (value, gui_config->dock_window_hint);
       break;
-    case PROP_TRANSIENT_DOCKS:
-      g_value_set_boolean (value, gui_config->transient_docks);
-      break;
     case PROP_CURSOR_FORMAT:
       g_value_set_enum (value, gui_config->cursor_format);
       break;
@@ -553,6 +549,7 @@ gimp_gui_config_get_property (GObject    *object,
     case PROP_MENU_MNEMONICS:
     case PROP_SHOW_TOOL_TIPS:
     case PROP_SHOW_TIPS:
+    case PROP_TRANSIENT_DOCKS:
       /* ignored */
       break;
 
diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h
index 63e05a8..6a96c79 100644
--- a/app/config/gimpguiconfig.h
+++ b/app/config/gimpguiconfig.h
@@ -69,7 +69,6 @@ struct _GimpGuiConfig
   gchar               *user_manual_online_uri;
   GimpWindowHint       toolbox_window_hint;
   GimpWindowHint       dock_window_hint;
-  gboolean             transient_docks;
   GimpCursorFormat     cursor_format;
 
   gint                 last_tip;  /* saved in sessionrc */
diff --git a/app/config/gimprc-blurbs.h b/app/config/gimprc-blurbs.h
index edb53b5..2ea5ee5 100644
--- a/app/config/gimprc-blurbs.h
+++ b/app/config/gimprc-blurbs.h
@@ -360,12 +360,6 @@ N_("Sets the swap file location. GIMP uses a tile based memory allocation " \
 #define TEAROFF_MENUS_BLURB \
 N_("When enabled, menus can be torn off.")
 
-#define TRANSIENT_DOCKS_BLURB \
-N_("When enabled, dock windows (the toolbox and palettes) are set to be " \
-   "transient to the active image window. Most window managers will " \
-   "keep the dock windows above the image window then, but it may also " \
-   "have other effects.")
-
 #define CAN_CHANGE_ACCELS_BLURB \
 N_("When enabled, you can change keyboard shortcuts for menu items " \
    "by hitting a key combination while the menu item is highlighted.")
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index c2c146c..a499d3d 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -2633,13 +2633,6 @@ prefs_dialog_new (Gimp       *gimp,
                             _("Hint for other _docks:"),
                             GTK_TABLE (table), 1, size_group);
 
-#ifdef GIMP_UNSTABLE
-  prefs_check_button_add (object, "transient-docks",
-                          _("Toolbox and other docks are transient "
-                            "to the active image window"),
-                          GTK_BOX (vbox2));
-#endif
-
   vbox2 = prefs_frame_new (_("Focus"),
                            GTK_CONTAINER (vbox), FALSE);
 
diff --git a/app/widgets/gimpimagedock.c b/app/widgets/gimpimagedock.c
index 71ced4e..f4caed5 100644
--- a/app/widgets/gimpimagedock.c
+++ b/app/widgets/gimpimagedock.c
@@ -51,10 +51,6 @@ static void      gimp_image_dock_image_flush      (GimpImage         *image,
                                                    gboolean           invalidate_preview,
                                                    GimpImageDock     *dock);
 
-static void      gimp_image_dock_notify_transient (GimpConfig        *config,
-                                                   GParamSpec        *pspec,
-                                                   GimpDock          *dock);
-
 
 G_DEFINE_TYPE (GimpImageDock, gimp_image_dock, GIMP_TYPE_DOCK)
 
@@ -117,11 +113,6 @@ gimp_image_dock_constructor (GType                  type,
                            G_CALLBACK (gimp_image_dock_display_changed),
                            dock, 0);
 
-  g_signal_connect_object (gimp_dock_get_context (GIMP_DOCK (dock))->gimp->config,
-                           "notify::transient-docks",
-                           G_CALLBACK (gimp_image_dock_notify_transient),
-                           dock, 0);
-
   return object;
 }
 
@@ -152,24 +143,6 @@ gimp_image_dock_display_changed (GimpContext   *context,
                                  GimpImageDock *dock)
 {
   gimp_ui_manager_update (dock->ui_manager, display);
-
-  if (GIMP_GUI_CONFIG (context->gimp->config)->transient_docks)
-    {
-      GtkWindow *parent = NULL;
-
-      if (display)
-        g_object_get (display, "shell", &parent, NULL);
-
-      gtk_window_set_transient_for (GTK_WINDOW (dock), parent);
-      GIMP_LOG (WM, "Setting dock '%s' [%p] transient for '%s' [%p]",
-                gtk_window_get_title (GTK_WINDOW (dock)),
-                dock,
-                gtk_window_get_title (parent),
-                parent);
-
-      if (parent)
-        g_object_unref (parent);
-    }
 }
 
 static void
@@ -185,23 +158,3 @@ gimp_image_dock_image_flush (GimpImage     *image,
         gimp_ui_manager_update (dock->ui_manager, display);
     }
 }
-
-static void
-gimp_image_dock_notify_transient (GimpConfig *config,
-                                  GParamSpec *pspec,
-                                  GimpDock   *dock)
-{
-  if (GIMP_GUI_CONFIG (config)->transient_docks)
-    {
-      gimp_image_dock_display_changed (gimp_dock_get_context (dock),
-                                       gimp_context_get_display (gimp_dock_get_context (dock)),
-                                       GIMP_IMAGE_DOCK (dock));
-    }
-  else
-    {
-      gtk_window_set_transient_for (GTK_WINDOW (dock), NULL);
-      GIMP_LOG (WM, "Setting dock '%s' [%p] transient for NULL",
-                gtk_window_get_title (GTK_WINDOW (dock)),
-                dock);
-    }
-}