mtasaka pushed to libfm (f22). "Make search dialog work"

[notifications at fedoraproject.org]

From 7aa6e62521fef644e81befd120c58ea3d93bad46 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Sat, 23 May 2015 03:25:25 +0900
Subject: Make search dialog work


diff --git a/0001-Make-file-search-dialog-work-with-GTK3.patch b/0001-Make-file-search-dialog-work-with-GTK3.patch
new file mode 100644
index 0000000..69e8e3c
--- /dev/null
+++ b/0001-Make-file-search-dialog-work-with-GTK3.patch
@@ -0,0 +1,38 @@
+From 0a695b72b51bb6b4c5463279ef8751ab3eef7286 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Sat, 23 May 2015 02:59:18 +0900
+Subject: [PATCH] Make file search dialog work
+
+At least with GTK 3.4+, GtkNotebook no longer
+support tab_border, tab_hborder, tab_vborder
+property. With leaving these properties,
+gtk_builder_add_from_file () fails, which
+leads to file search dialog malfunction.
+
+Note that GTK 2 has already deprecated
+these, so removing these should also be
+find on GTK 2
+
+https://developer.gnome.org/gtk2/stable/GtkNotebook.html
+https://developer.gnome.org/gtk3/stable/GtkNotebook.html
+---
+ data/ui/filesearch.glade | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/data/ui/filesearch.glade b/data/ui/filesearch.glade
+index d8e93d4..f689a57 100644
+--- a/data/ui/filesearch.glade
++++ b/data/ui/filesearch.glade
+@@ -183,9 +183,6 @@
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="scrollable">True</property>
+-            <property name="tab_border">0</property>
+-            <property name="tab_hborder">0</property>
+-            <property name="tab_vborder">0</property>
+             <child>
+               <object class="GtkVBox" id="general_settings_container">
+                 <property name="visible">True</property>
+-- 
+2.4.1
+
diff --git a/libfm.spec b/libfm.spec
index a7e709d..4190832 100644
--- a/libfm.spec
+++ b/libfm.spec
@@ -8,7 +8,7 @@
 %global         prerpmver    %(echo "%{?prever}" | sed -e 's|-||g')
 
 %global         usegit      1
-%global         mainrel     4
+%global         mainrel     5
 
 %global         githash     577806e29d2ec27ce5fee9dc816566fb4e23b155
 %global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
@@ -39,6 +39,7 @@ Source0:        http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?pr
 # Fedora specific patches
 # Firefox uses firefox.desktop for desktop name, drop
 #Patch0:         libfm-0.1.9-pref-apps.patch
+Patch100:       0001-Make-file-search-dialog-work-with-GTK3.patch
 
 BuildRequires:  libexif-devel
 BuildRequires:  gtk3-devel
@@ -138,6 +139,7 @@ This package containg development documentation files for %{name}.
 #%%setup -q -n %{name}-%{version}%{?prever}
 #%%patch0 -p1 -b .orig
 %setup -q -n %{name}-%{githash}
+%patch100 -p1
 
 %if 0%{?usegit} >= 1
 sh autogen.sh
@@ -282,6 +284,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %endif
 
 %changelog
+* Sat May 23 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.3-5.D20150521git577806e29d
+- Make search dialog work
+
 * Thu May 21 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.3-4.D20150521git577806e29d
 - Again try the latest git
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libfm.git/commit/?h=f22&id=7aa6e62521fef644e81befd120c58ea3d93bad46