summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-29 17:45:52 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-29 17:45:52 +0000
commit25081db18300fd5e3bda7bd8895bd9ec565ee876 (patch)
tree02faa49f9f78bb6a3c89f56d794edef9e4277455 /meta
parent2e296ba3f83da9a3e8668e68911e4bd3b0a6c206 (diff)
downloadopenembedded-core-25081db18300fd5e3bda7bd8895bd9ec565ee876.tar.gz
openembedded-core-25081db18300fd5e3bda7bd8895bd9ec565ee876.tar.bz2
openembedded-core-25081db18300fd5e3bda7bd8895bd9ec565ee876.tar.xz
openembedded-core-25081db18300fd5e3bda7bd8895bd9ec565ee876.zip
gtk+-2.12: Tweak filechooser size patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3880 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch28
-rw-r--r--meta/packages/gtk+/gtk+_2.12.7.bb2
2 files changed, 23 insertions, 7 deletions
diff --git a/meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch b/meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
index 11ec6a269..4de68dfb9 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
+++ b/meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
@@ -1,15 +1,31 @@
-Index: gtk+-2.12.7/gtk/gtkfilechooserdefault.c
-===================================================================
---- gtk+-2.12.7.orig/gtk/gtkfilechooserdefault.c 2008-02-29 15:04:29.000000000 +0000
-+++ gtk+-2.12.7/gtk/gtkfilechooserdefault.c 2008-02-29 15:05:23.000000000 +0000
+
+diff -ur /tmp/gtk+-2.12.7/gtk/gtkfilechooserdefault.c ./gtk/gtkfilechooserdefault.c
+--- /tmp/gtk+-2.12.7/gtk/gtkfilechooserdefault.c 2008-02-29 17:00:14.000000000 +0000
++++ ./gtk/gtkfilechooserdefault.c 2008-02-29 17:25:21.000000000 +0000
@@ -178,8 +178,8 @@
#define FALLBACK_ICON_SIZE 24
#define LIST_HBOX_SPACING DEFAULT_SPACING
-#define NUM_LINES 45
-#define NUM_CHARS 60
-+#define NUM_LINES 15
-+#define NUM_CHARS 20
++#define NUM_LINES 10
++#define NUM_CHARS 12
static void gtk_file_chooser_default_iface_init (GtkFileChooserIface *iface);
static void gtk_file_chooser_embed_default_iface_init (GtkFileChooserEmbedIface *iface);
+diff -ur /tmp/gtk+-2.12.7/gtk/gtkfilechooserdialog.c ./gtk/gtkfilechooserdialog.c
+--- /tmp/gtk+-2.12.7/gtk/gtkfilechooserdialog.c 2008-01-30 03:11:07.000000000 +0000
++++ ./gtk/gtkfilechooserdialog.c 2008-02-29 17:20:30.000000000 +0000
+@@ -165,10 +165,10 @@
+ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+ if (width)
+- *width = MIN (*width, (monitor.width * 3) / 4);
++ *width = MIN (*width, monitor.width);
+
+ if (height)
+- *height = MIN (*height, (monitor.height * 3) / 4);
++ *height = MIN (*height, monitor.height);
+ }
+
+ static void
diff --git a/meta/packages/gtk+/gtk+_2.12.7.bb b/meta/packages/gtk+/gtk+_2.12.7.bb
index bddddde51..f66b4b80b 100644
--- a/meta/packages/gtk+/gtk+_2.12.7.bb
+++ b/meta/packages/gtk+/gtk+_2.12.7.bb
@@ -1,7 +1,7 @@
require gtk+.inc
DEPENDS += "cairo"
-PR = "r4"
+PR = "r5"
SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
file://xsettings.patch;patch=1 \