Fix for filechooser centering: bug #239360

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 573 insertions, 2 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 3a62528ce591..e67fd2ecd756 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.408 2009/01/15 00:58:21 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.409 2009/01/29 20:28:37 dang Exp $
+
+*gtk+-2.14.7-r1 (29 Jan 2009)
+
+  29 Jan 2009; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gtk+-2.14.7-filechooser.patch, +gtk+-2.14.7-r1.ebuild:
+  Fix for filechooser centering: bug #239360
 
 *gtk+-2.14.7 (15 Jan 2009)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index ace9e350f9db..b2b80f1e0dea 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
 AUX gtk+-1.2.10-automake.patch 3270 RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e SHA1 1ba127d50f7eddc86e07a37c819b9dd233d27926 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2
@@ -13,6 +16,7 @@ AUX gtk+-2.12.10-fix-nocxx.patch 609 RMD160 14dc65ddadca384a54024306dd0a3ce39025
 AUX gtk+-2.12.10-no-libintl.patch 691 RMD160 2290b968d630720e73225f08eefd5ccbba9e5dea SHA1 1e85f38d3ab139453ab7a41e76240c44675c9f39 SHA256 101973cc02023475fb96c4d8235d0ef90a7eeeab5489d56e0e7b0d29ca711b90
 AUX gtk+-2.12.9-libtool-2.patch 920 RMD160 3ef1dfe66e89af4fe9b51d662e6cc3f7fdaa6e3d SHA1 2e788ff62ed2bffc7c3f5e7900466a3fa0f95b3b SHA256 0f9c8c0700d22c55dff1e943651a20165dc3de510e00169e6f03c7e57063abfb
 AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734
+AUX gtk+-2.14.7-filechooser.patch 13798 RMD160 0c1ef9582cb82693bb2cf0e80478b30276b9b835 SHA1 d163af3af1a19f2c88a0d811f87615448e40a45e SHA256 38cdee07dadf6d8612b55958f6af57e0e70a0f0974c30452d6b8a9943653caf4
 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd
 AUX gtk+-2.8.10-xinerama.patch 1083 RMD160 499801f3be2289bdc656563bb5c96797d14512f7 SHA1 7817e3c2bbec1058192d524d68e78635fa48beca SHA256 7786691d5f89588abc7174e97cbd374d8cbe98b4e8dfd27005eade03b047aa2d
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
@@ -32,6 +36,14 @@ EBUILD gtk+-2.12.12.ebuild 4964 RMD160 96178ab4ded53396ba6c17fa8ed6d8d858046e61
 EBUILD gtk+-2.12.8.ebuild 4676 RMD160 b0271ae3aafb496ac80b0d1b629dc64cc3c4a05d SHA1 6fc2c15ea3ddbef1fc7f09b308486c601ad533f2 SHA256 cfdb3d953b9659a24a002729f103f37057d70aa741652516396b84a6daf73445
 EBUILD gtk+-2.14.4.ebuild 4523 RMD160 591512449b641e80837a418734ad71a34d22f38e SHA1 76f45e8f1d697258e8fa6867877b65be49769005 SHA256 ea5eca06e4d8afa3b72321b77da182b6724d544fa19e2bfadb8171ed83f4d846
 EBUILD gtk+-2.14.5.ebuild 4523 RMD160 205bf04ebe1f2d0faadfdbed0a4095bed3f71a21 SHA1 638d81d7a5b88907e88445ee7a6cfe701c852385 SHA256 1dfe63b3f6b37112a349fd6a62f51c0f2df31b926175b3ec9aa4a43262c0cd4e
+EBUILD gtk+-2.14.7-r1.ebuild 4624 RMD160 b9d69852737725e7c9c4ad12116b27e236ef6e63 SHA1 24b51b53ed7001019a3321e7f49b786f088be8d3 SHA256 4cc5512d8505b844696ca1d0638d7b1e326c40cd484ef23f9ef32509e15a17d0
 EBUILD gtk+-2.14.7.ebuild 4524 RMD160 a5d9d2cc52a77f1181d6ebb58cafee669b4b45cb SHA1 7c760da88f0c7ff67a7039f833012735005859df SHA256 7cf7a07904a2e163024e29cf843f76166d561e69b7fd35f5ea49d11f60aeeab7
-MISC ChangeLog 60028 RMD160 0a1a0e6f317fdab8f989439bdfe65402c84efaf6 SHA1 0bf38e65925f0216939abaa616d218f9c4d436cf SHA256 5d2798590a9ab90ab82feb8b5e615c8e24f5ed97a3043199d20a6b4ce202d13a
+MISC ChangeLog 60220 RMD160 33d90f65a25dafac11bc9bf08245f8758342a8da SHA1 baff1fbf5e5ae40cec5bb26c9e94c4008b7d3f7c SHA256 6b489371efd053fa2a7e5bbaca3b048fcbafc010c727cf2c4b98b9ef0a683ad6
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iD8DBQFJghGhomPajV0RnrERAgdZAJ4xV5e9BbV0NZ31KnVPRvlGDdHGMgCeLaxI
+bT8lku0U66w+og4CzbtFozs=
+=zCr/
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-2.14.7-filechooser.patch b/x11-libs/gtk+/files/gtk+-2.14.7-filechooser.patch
new file mode 100644
index 000000000000..0010b20754d9
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.7-filechooser.patch
@@ -0,0 +1,392 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.14.7.orig/gtk/gtkfilechooserdefault.c gtk+-2.14.7/gtk/gtkfilechooserdefault.c
+--- gtk+-2.14.7.orig/gtk/gtkfilechooserdefault.c	2009-01-07 11:32:57.000000000 -0500
++++ gtk+-2.14.7/gtk/gtkfilechooserdefault.c	2009-01-29 14:51:40.000000000 -0500
+@@ -34,6 +34,7 @@
+ #include "gtkexpander.h"
+ #include "gtkfilechooserprivate.h"
+ #include "gtkfilechooserdefault.h"
++#include "gtkfilechooserdialog.h"
+ #include "gtkfilechooserembed.h"
+ #include "gtkfilechooserentry.h"
+ #include "gtkfilechoosersettings.h"
+@@ -273,6 +274,7 @@ static void     gtk_file_chooser_default
+ 						       GParamSpec            *pspec);
+ static void     gtk_file_chooser_default_dispose      (GObject               *object);
+ static void     gtk_file_chooser_default_show_all       (GtkWidget             *widget);
++static void     gtk_file_chooser_default_realize        (GtkWidget             *widget);
+ static void     gtk_file_chooser_default_map            (GtkWidget             *widget);
+ static void     gtk_file_chooser_default_unmap          (GtkWidget             *widget);
+ static void     gtk_file_chooser_default_hierarchy_changed (GtkWidget          *widget,
+@@ -565,6 +567,7 @@ _gtk_file_chooser_default_class_init (Gt
+   gobject_class->dispose = gtk_file_chooser_default_dispose;
+ 
+   widget_class->show_all = gtk_file_chooser_default_show_all;
++  widget_class->realize = gtk_file_chooser_default_realize;
+   widget_class->map = gtk_file_chooser_default_map;
+   widget_class->unmap = gtk_file_chooser_default_unmap;
+   widget_class->hierarchy_changed = gtk_file_chooser_default_hierarchy_changed;
+@@ -1156,9 +1159,6 @@ change_folder_and_display_error (GtkFile
+ static void
+ emit_default_size_changed (GtkFileChooserDefault *impl)
+ {
+-  if (!GTK_WIDGET_MAPPED (impl))
+-    return;
+-
+   profile_msg ("    emit default-size-changed start", NULL);
+   g_signal_emit_by_name (impl, "default-size-changed");
+   profile_msg ("    emit default-size-changed end", NULL);
+@@ -1192,7 +1192,8 @@ update_preview_widget_visibility (GtkFil
+   else
+     gtk_widget_hide (impl->preview_box);
+ 
+-  emit_default_size_changed (impl);
++  if (!GTK_WIDGET_MAPPED (impl))
++    emit_default_size_changed (impl);
+ }
+ 
+ static void
+@@ -5986,6 +5987,31 @@ settings_load (GtkFileChooserDefault *im
+ }
+ 
+ static void
++save_dialog_geometry (GtkFileChooserDefault *impl, GtkFileChooserSettings *settings)
++{
++  GtkWindow *toplevel;
++  int x, y, width, height;
++
++  /* We don't save the geometry in non-expanded "save" mode, so that the "little
++   * dialog" won't make future Open dialogs too small.
++   */
++  if (!(impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
++	|| impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
++	|| impl->expand_folders))
++    return;
++
++  toplevel = get_toplevel (GTK_WIDGET (impl));
++
++  if (!(toplevel && GTK_IS_FILE_CHOOSER_DIALOG (toplevel)))
++    return;
++
++  gtk_window_get_position (toplevel, &x, &y);
++  gtk_window_get_size (toplevel, &width, &height);
++
++  _gtk_file_chooser_settings_set_geometry (settings, x, y, width, height);
++}
++
++static void
+ settings_save (GtkFileChooserDefault *impl)
+ {
+   GtkFileChooserSettings *settings;
+@@ -5996,12 +6022,28 @@ settings_save (GtkFileChooserDefault *im
+   _gtk_file_chooser_settings_set_show_hidden (settings, gtk_file_chooser_get_show_hidden (GTK_FILE_CHOOSER (impl)));
+   _gtk_file_chooser_settings_set_expand_folders (settings, impl->expand_folders);
+ 
++  save_dialog_geometry (impl, settings);
++
+   /* NULL GError */
+   _gtk_file_chooser_settings_save (settings, NULL);
+ 
+   g_object_unref (settings);
+ }
+ 
++/* GtkWidget::realize method */
++static void
++gtk_file_chooser_default_realize (GtkWidget *widget)
++{
++  GtkFileChooserDefault *impl;
++  char *current_working_dir;
++
++  impl = GTK_FILE_CHOOSER_DEFAULT (widget);
++
++  GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->realize (widget);
++
++  emit_default_size_changed (impl);
++}
++
+ /* GtkWidget::map method */
+ static void
+ gtk_file_chooser_default_map (GtkWidget *widget)
+@@ -6055,8 +6097,6 @@ gtk_file_chooser_default_map (GtkWidget 
+ 
+   settings_load (impl);
+ 
+-  emit_default_size_changed (impl);
+-
+   profile_end ("end", NULL);
+ }
+ 
+@@ -7886,6 +7926,20 @@ gtk_file_chooser_default_get_default_siz
+       || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+       || impl->expand_folders)
+     {
++      GtkFileChooserSettings *settings;
++      int x, y, width, height;
++
++      settings = _gtk_file_chooser_settings_new ();
++      _gtk_file_chooser_settings_get_geometry (settings, &x, &y, &width, &height);
++      g_object_unref (settings);
++
++      if (x >= 0 && y >= 0 && width > 0 && height > 0)
++	{
++	  *default_width = width;
++	  *default_height = height;
++	  return;
++	}
++
+       find_good_size_from_style (GTK_WIDGET (chooser_embed), default_width, default_height);
+ 
+       if (impl->preview_widget_active &&
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.14.7.orig/gtk/gtkfilechooserdialog.c gtk+-2.14.7/gtk/gtkfilechooserdialog.c
+--- gtk+-2.14.7.orig/gtk/gtkfilechooserdialog.c	2009-01-07 11:32:57.000000000 -0500
++++ gtk+-2.14.7/gtk/gtkfilechooserdialog.c	2009-01-29 14:51:40.000000000 -0500
+@@ -25,6 +25,7 @@
+ #include "gtkfilechooserwidget.h"
+ #include "gtkfilechooserutils.h"
+ #include "gtkfilechooserembed.h"
++#include "gtkfilechoosersettings.h"
+ #include "gtkfilesystem.h"
+ #include "gtktypebuiltins.h"
+ #include "gtkintl.h"
+@@ -154,37 +155,33 @@ file_chooser_widget_file_activated (GtkF
+   g_list_free (children);
+ }
+ 
++#if 0
++/* FIXME: to see why this function is ifdef-ed out, see the comment below in
++ * file_chooser_widget_default_size_changed().
++ */
+ static void
+-clamp_to_screen (GtkWidget *widget,
+-		 gint      *width,
+-		 gint      *height)
+-{
+-  GdkScreen *screen;
+-  int monitor_num;
+-  GdkRectangle monitor;
+-
+-  g_return_if_fail (GTK_WIDGET_REALIZED (widget));
+-  
+-  screen = gtk_widget_get_screen (widget);
+-  monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
+-
+-  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
++load_position (int *out_xpos, int *out_ypos)
++{
++  GtkFileChooserSettings *settings;
++  int x, y, width, height;
+ 
+-  if (width)
+-    *width = MIN (*width, (monitor.width * 3) / 4);
++  settings = _gtk_file_chooser_settings_new ();
++  _gtk_file_chooser_settings_get_geometry (settings, &x, &y, &width, &height);
++  g_object_unref (settings);
+ 
+-  if (height)
+-    *height = MIN (*height, (monitor.height * 3) / 4);
++  *out_xpos = x;
++  *out_ypos = y;
+ }
++#endif
+ 
+ static void
+ file_chooser_widget_default_size_changed (GtkWidget            *widget,
+ 					  GtkFileChooserDialog *dialog)
+ {
+   GtkFileChooserDialogPrivate *priv;
+-  gint width, height;
+   gint default_width, default_height;
+   GtkRequisition req, widget_req;
++  int xpos, ypos;
+ 
+   priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
+ 
+@@ -197,27 +194,29 @@ file_chooser_widget_default_size_changed
+        * that widget->requisition is meaningful. */
+       gtk_widget_size_request (GTK_WIDGET (dialog), &req);
+       gtk_widget_size_request (widget, &widget_req);
+-
+-      width = req.width - widget_req.width;
+-      height = req.height - widget_req.height;
+-    }
+-  else
+-    {
+-      width = GTK_WIDGET (dialog)->allocation.width - widget->allocation.width;
+-      height = GTK_WIDGET (dialog)->allocation.height - widget->allocation.height;
+     }
+ 
+   _gtk_file_chooser_embed_get_default_size (GTK_FILE_CHOOSER_EMBED (priv->widget),
+ 					    &default_width, &default_height);
+ 
+-  /* Ideal target size plus any extra size */
+-  width = default_width + width + (2 * GTK_CONTAINER (dialog)->border_width);
+-  height = default_height + height + (2 * GTK_CONTAINER (dialog)->border_width);
+-
+-  if (GTK_WIDGET_REALIZED (dialog))
+-    clamp_to_screen (GTK_WIDGET (dialog), &width, &height);
++  gtk_window_resize (GTK_WINDOW (dialog), default_width, default_height);
+ 
+-  gtk_window_resize (GTK_WINDOW (dialog), width, height);
++  if (!GTK_WIDGET_MAPPED (dialog))
++    {
++#if 0
++      /* FIXME: the code to restore the position does not work yet.  It is not
++       * clear whether it is actually desirable --- if enabled, applications
++       * would not be able to say "center the file chooser on top of my toplevel
++       * window".  So, we don't use this code at all.
++       */
++      load_position (&xpos, &ypos);
++      if (xpos >= 0 && ypos >= 0)
++	{
++	  gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_NONE);
++	  gtk_window_move (GTK_WINDOW (dialog), xpos, ypos);
++	}
++#endif
++    }
+ }
+ 
+ static void
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.14.7.orig/gtk/gtkfilechoosersettings.c gtk+-2.14.7/gtk/gtkfilechoosersettings.c
+--- gtk+-2.14.7.orig/gtk/gtkfilechoosersettings.c	2009-01-07 11:32:57.000000000 -0500
++++ gtk+-2.14.7/gtk/gtkfilechoosersettings.c	2009-01-29 14:53:10.000000000 -0500
+@@ -41,6 +41,10 @@
+ #define LOCATION_MODE_KEY	"LocationMode"
+ #define SHOW_HIDDEN_KEY		"ShowHidden"
+ #define EXPAND_FOLDERS_KEY	"ExpandFolders"
++#define GEOMETRY_X_KEY		"GeometryX"
++#define GEOMETRY_Y_KEY		"GeometryY"
++#define GEOMETRY_WIDTH_KEY	"GeometryWidth"
++#define GEOMETRY_HEIGHT_KEY	"GeometryHeight"
+ 
+ #define MODE_PATH_BAR          "path-bar"
+ #define MODE_FILENAME_ENTRY    "filename-entry"
+@@ -60,6 +64,24 @@ get_config_filename (void)
+ }
+ 
+ static void
++get_int_key (GKeyFile *key_file, const char *group, const char *key, int *out_value)
++{
++  GError *error;
++  int val;
++
++  error = NULL;
++  val = g_key_file_get_integer (key_file, group, key, &error);
++
++  if (val == 0 && error != NULL)
++    {
++      *out_value = -1;
++      g_error_free (error);
++    }
++  else
++    *out_value = val;
++}
++
++static void
+ ensure_settings_read (GtkFileChooserSettings *settings)
+ {
+   GError *error;
+@@ -127,6 +149,11 @@ ensure_settings_read (GtkFileChooserSett
+   else
+     settings->expand_folders = value != FALSE;
+ 
++  get_int_key (key_file, SETTINGS_GROUP, GEOMETRY_X_KEY, &settings->geometry_x);
++  get_int_key (key_file, SETTINGS_GROUP, GEOMETRY_Y_KEY, &settings->geometry_y);
++  get_int_key (key_file, SETTINGS_GROUP, GEOMETRY_WIDTH_KEY, &settings->geometry_width);
++  get_int_key (key_file, SETTINGS_GROUP, GEOMETRY_HEIGHT_KEY, &settings->geometry_height);
++
+  out:
+ 
+   g_key_file_free (key_file);
+@@ -148,6 +175,10 @@ _gtk_file_chooser_settings_init (GtkFile
+   settings->location_mode = LOCATION_MODE_PATH_BAR;
+   settings->show_hidden = FALSE;
+   settings->expand_folders = FALSE;
++  settings->geometry_x	    = -1;
++  settings->geometry_y	    = -1;
++  settings->geometry_width  = -1;
++  settings->geometry_height = -1;
+ }
+ 
+ GtkFileChooserSettings *
+@@ -198,6 +229,34 @@ _gtk_file_chooser_settings_set_expand_fo
+   settings->expand_folders = expand_folders != FALSE;
+ }
+ 
++void
++_gtk_file_chooser_settings_get_geometry (GtkFileChooserSettings *settings,
++					 int                    *out_x,
++					 int                    *out_y,
++					 int                    *out_width,
++					 int                    *out_height)
++{
++  ensure_settings_read (settings);
++
++  *out_x      = settings->geometry_x;
++  *out_y      = settings->geometry_y;
++  *out_width  = settings->geometry_width;
++  *out_height = settings->geometry_height;
++}
++
++void
++_gtk_file_chooser_settings_set_geometry (GtkFileChooserSettings *settings,
++					 int                     x,
++					 int                     y,
++					 int                     width,
++					 int                     height)
++{
++  settings->geometry_x	    = x;
++  settings->geometry_y	    = y;
++  settings->geometry_width  = width;
++  settings->geometry_height = height;
++}
++
+ gboolean
+ _gtk_file_chooser_settings_save (GtkFileChooserSettings *settings,
+ 				 GError                **error)
+@@ -238,6 +297,14 @@ _gtk_file_chooser_settings_save (GtkFile
+ 			  SHOW_HIDDEN_KEY, settings->show_hidden);
+   g_key_file_set_boolean (key_file, SETTINGS_GROUP,
+ 			  EXPAND_FOLDERS_KEY, settings->expand_folders);
++  g_key_file_set_integer (key_file, SETTINGS_GROUP,
++			  GEOMETRY_X_KEY, settings->geometry_x);
++  g_key_file_set_integer (key_file, SETTINGS_GROUP,
++			  GEOMETRY_Y_KEY, settings->geometry_y);
++  g_key_file_set_integer (key_file, SETTINGS_GROUP,
++			  GEOMETRY_WIDTH_KEY, settings->geometry_width);
++  g_key_file_set_integer (key_file, SETTINGS_GROUP,
++			  GEOMETRY_HEIGHT_KEY, settings->geometry_height);
+ 
+   contents = g_key_file_to_data (key_file, &len, error);
+   g_key_file_free (key_file);
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.14.7.orig/gtk/gtkfilechoosersettings.h gtk+-2.14.7/gtk/gtkfilechoosersettings.h
+--- gtk+-2.14.7.orig/gtk/gtkfilechoosersettings.h	2009-01-07 11:32:57.000000000 -0500
++++ gtk+-2.14.7/gtk/gtkfilechoosersettings.h	2009-01-29 14:53:44.000000000 -0500
+@@ -38,6 +38,11 @@ struct _GtkFileChooserSettings
+ 
+   LocationMode location_mode;
+ 
++  int geometry_x;
++  int geometry_y;
++  int geometry_width;
++  int geometry_height;
++
+   guint settings_read : 1;
+ 
+   guint show_hidden : 1;
+@@ -66,6 +71,17 @@ gboolean _gtk_file_chooser_settings_get_
+ void     _gtk_file_chooser_settings_set_expand_folders (GtkFileChooserSettings *settings,
+ 							gboolean                expand_folders);
+ 
++void _gtk_file_chooser_settings_get_geometry (GtkFileChooserSettings *settings,
++					      int                    *out_x,
++					      int                    *out_y,
++					      int                    *out_width,
++					      int                    *out_heigth);
++void _gtk_file_chooser_settings_set_geometry (GtkFileChooserSettings *settings,
++					      int                     x,
++					      int                     y,
++					      int                     width,
++					      int                     heigth);
++
+ gboolean _gtk_file_chooser_settings_save (GtkFileChooserSettings *settings,
+ 					  GError                **error);
+ 
diff --git a/x11-libs/gtk+/gtk+-2.14.7-r1.ebuild b/x11-libs/gtk+/gtk+-2.14.7-r1.ebuild
new file mode 100644
index 000000000000..856d3147a2d4
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.14.7-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.14.7-r1.ebuild,v 1.1 2009/01/29 20:28:37 dang Exp $
+
+WANT_AUTOMAKE="1.7"
+
+inherit gnome.org flag-o-matic eutils libtool virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cups debug doc jpeg jpeg2k tiff vim-syntax xinerama"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.17.6
+	>=x11-libs/pango-1.20
+	>=dev-libs/atk-1.13
+	>=x11-libs/cairo-1.6
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	!<gnome-base/gail-1000"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/damageproto
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.8
+	doc? (
+			>=dev-util/gtk-doc-1.8
+			~app-text/docbook-xml-dtd-4.1.2
+		 )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Please re-emerge x11-libs/cairo with the X USE flag set"
+		die "cairo needs the X flag set"
+	fi
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
+
+	# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
+	epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch"
+
+	# Don't break inclusion of gtkclist.h, upstream bug 536767
+	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
+
+	# Fix filechooser placement.  bug #239360
+	epatch "${FILESDIR}/${PN}-2.14.7-filechooser.patch"
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	elibtoolize
+}
+
+src_compile() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(use_enable xinerama) \
+		$(use_enable cups cups auto) \
+		--with-libpng \
+		--with-gdktarget=x11 \
+		--with-xinput"
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "compile failed"
+}
+
+src_test() {
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	dodir /etc/env.d
+	echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2"
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${D}/etc/gtk-2.0/gtk.immodules"
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+		gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	else
+		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+	fi
+
+	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	elog "Please install app-text/evince for print preview functionality."
+	elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+	elog "add it to your gtkrc."
+}