diff options
author | Ross Burton <ross@openedhand.com> | 2008-02-16 16:51:13 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-02-16 16:51:13 +0000 |
commit | fa36fa237099d60bfc9f451f59b5857652895094 (patch) | |
tree | 8fa85cb1163be088a098e177a8844c6da8f6b68f /meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch | |
parent | c7e79ab0ad5a004f2145179566911d151e7cc6c1 (diff) | |
download | openembedded-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+/gtk+-2.12.7/filechooser-utils.patch')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch b/meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch deleted file mode 100644 index 45cfd4fd6..000000000 --- a/meta/packages/gtk+/gtk+-2.12.7/filechooser-utils.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: gtk+-2.12.3/gtk/gtkfilechooserutils.h -=================================================================== ---- gtk+-2.12.3.orig/gtk/gtkfilechooserutils.h 2007-12-04 16:52:08.000000000 +0000 -+++ gtk+-2.12.3/gtk/gtkfilechooserutils.h 2008-01-02 13:15:17.000000000 +0000 -@@ -41,7 +41,9 @@ - GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE, - GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN, - GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION, -- GTK_FILE_CHOOSER_PROP_LAST = GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION -+ GTK_FILE_CHOOSER_PROP_ROOT_FOLDER, -+ GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER, -+ GTK_FILE_CHOOSER_PROP_LAST = GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER - } GtkFileChooserProp; - - void _gtk_file_chooser_install_properties (GObjectClass *klass); -Index: gtk+-2.12.3/gtk/gtkfilechooserutils.c -=================================================================== ---- gtk+-2.12.3.orig/gtk/gtkfilechooserutils.c 2007-12-04 16:52:08.000000000 +0000 -+++ gtk+-2.12.3/gtk/gtkfilechooserutils.c 2008-01-02 13:15:17.000000000 +0000 -@@ -117,6 +117,12 @@ - g_object_class_override_property (klass, - GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION, - "do-overwrite-confirmation"); -+ g_object_class_override_property (klass, -+ GTK_FILE_CHOOSER_PROP_ROOT_FOLDER, -+ "root-folder"); -+ g_object_class_override_property (klass, -+ GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER, -+ "show-create-folder"); - } - - /** |