summaryrefslogtreecommitdiff
path: root/meta/packages/gtk+
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-02-16 16:51:13 +0000
committerRoss Burton <ross@openedhand.com>2008-02-16 16:51:13 +0000
commitfa36fa237099d60bfc9f451f59b5857652895094 (patch)
tree8fa85cb1163be088a098e177a8844c6da8f6b68f /meta/packages/gtk+
parentc7e79ab0ad5a004f2145179566911d151e7cc6c1 (diff)
downloadopenembedded-core-fa36fa237099d60bfc9f451f59b5857652895094.tar.gz
openembedded-core-fa36fa237099d60bfc9f451f59b5857652895094.tar.bz2
openembedded-core-fa36fa237099d60bfc9f451f59b5857652895094.tar.xz
openembedded-core-fa36fa237099d60bfc9f451f59b5857652895094.zip
gtk+: merge two related patches into a single file
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3822 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gtk+')
-rw-r--r--meta/packages/gtk+/gtk+-2.12.7/filechooser-props.patch (renamed from meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch)25
-rw-r--r--meta/packages/gtk+/gtk+-2.12.7/filechooser.patch25
-rw-r--r--meta/packages/gtk+/gtk+_2.12.7.bb3
3 files changed, 26 insertions, 27 deletions
diff --git a/meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch b/meta/packages/gtk+/gtk+-2.12.7/filechooser-props.patch
index 45cfd4fd6..7d55f3cbb 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch
+++ b/meta/packages/gtk+/gtk+-2.12.7/filechooser-props.patch
@@ -1,3 +1,28 @@
+Index: gtk+-2.12.3/gtk/gtkfilechooser.c
+===================================================================
+--- gtk+-2.12.3.orig/gtk/gtkfilechooser.c 2007-12-04 16:52:08.000000000 +0000
++++ gtk+-2.12.3/gtk/gtkfilechooser.c 2008-01-02 13:15:38.000000000 +0000
+@@ -272,6 +272,20 @@
+ "if necessary."),
+ FALSE,
+ GTK_PARAM_READWRITE));
++
++ g_object_interface_install_property (g_iface,
++ g_param_spec_string ("root-folder",
++ P_("File System Root"),
++ P_("Root folder for the file system below which the user should not be able to switch"),
++ NULL,
++ G_PARAM_WRITABLE));
++
++ g_object_interface_install_property (g_iface,
++ g_param_spec_boolean ("show-create-folder",
++ P_("Show Create Folder button"),
++ P_("Whether the Create Folder button should be visible on the bar"),
++ TRUE,
++ G_PARAM_READWRITE));
+ }
+
+ /**
Index: gtk+-2.12.3/gtk/gtkfilechooserutils.h
===================================================================
--- gtk+-2.12.3.orig/gtk/gtkfilechooserutils.h 2007-12-04 16:52:08.000000000 +0000
diff --git a/meta/packages/gtk+/gtk+-2.12.7/filechooser.patch b/meta/packages/gtk+/gtk+-2.12.7/filechooser.patch
deleted file mode 100644
index c422f60d4..000000000
--- a/meta/packages/gtk+/gtk+-2.12.7/filechooser.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: gtk+-2.12.3/gtk/gtkfilechooser.c
-===================================================================
---- gtk+-2.12.3.orig/gtk/gtkfilechooser.c 2007-12-04 16:52:08.000000000 +0000
-+++ gtk+-2.12.3/gtk/gtkfilechooser.c 2008-01-02 13:15:38.000000000 +0000
-@@ -272,6 +272,20 @@
- "if necessary."),
- FALSE,
- GTK_PARAM_READWRITE));
-+
-+ g_object_interface_install_property (g_iface,
-+ g_param_spec_string ("root-folder",
-+ P_("File System Root"),
-+ P_("Root folder for the file system below which the user should not be able to switch"),
-+ NULL,
-+ G_PARAM_WRITABLE));
-+
-+ g_object_interface_install_property (g_iface,
-+ g_param_spec_boolean ("show-create-folder",
-+ P_("Show Create Folder button"),
-+ P_("Whether the Create Folder button should be visible on the bar"),
-+ TRUE,
-+ G_PARAM_READWRITE));
- }
-
- /**
diff --git a/meta/packages/gtk+/gtk+_2.12.7.bb b/meta/packages/gtk+/gtk+_2.12.7.bb
index 79784dd02..a29bd313f 100644
--- a/meta/packages/gtk+/gtk+_2.12.7.bb
+++ b/meta/packages/gtk+/gtk+_2.12.7.bb
@@ -14,8 +14,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
file://toggle-font.diff;patch=1;pnum=0 \
file://scrolled-placement.patch;patch=1;pnum=0 \
file://filesystem-volumes.patch;patch=1 \
- file://filechooser-utils.patch;patch=1 \
- file://filechooser.patch;patch=1 \
+ file://filechooser-props.patch;patch=1 \
file://filechooser-default.patch;patch=1 \
# temporary
# file://gtklabel-resize-patch;patch=1 \