mtasaka pushed to pcmanfm (f20). "Make about dialog work"

[notifications at fedoraproject.org]

From ec102a52973dc4bc2b5739e7af34dd82124b076a Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Thu, 21 May 2015 19:33:21 +0900
Subject: Make about dialog work


diff --git a/pcmanfm-1.2.3-about-dlg.patch b/pcmanfm-1.2.3-about-dlg.patch
new file mode 100644
index 0000000..fdf3861
--- /dev/null
+++ b/pcmanfm-1.2.3-about-dlg.patch
@@ -0,0 +1,30 @@
+--- pcmanfm-1.2.3/data/ui/about.glade.in.about	2014-01-02 23:22:26.000000000 +0900
++++ pcmanfm-1.2.3/data/ui/about.glade.in	2015-05-21 19:13:35.444733340 +0900
+@@ -6,7 +6,6 @@
+     <property name="border_width">5</property>
+     <property name="window_position">center-on-parent</property>
+     <property name="type_hint">dialog</property>
+-    <property name="has_separator">False</property>
+     <property name="program_name">PCManFM</property>
+     <property name="version">@VERSION@</property>
+     <property name="copyright" translatable="yes">Copyright (C) 2009 - 2014</property>
+--- pcmanfm-1.2.3/src/main-win.c.about	2014-08-24 07:55:04.000000000 +0900
++++ pcmanfm-1.2.3/src/main-win.c	2015-05-21 19:17:10.533985741 +0900
+@@ -1142,12 +1142,16 @@
+ {
+     if(!about_dlg)
+     {
++#if GTK_CHECK_VERSION(3, 10, 0)
++        GtkBuilder* builder = gtk_builder_new_from_file(PACKAGE_UI_DIR "/about.ui");
++#else
+         GtkBuilder* builder = gtk_builder_new();
+-        GString *comments = g_string_new(_("Lightweight file manager\n"));
+ 
+         gtk_builder_add_from_file(builder, PACKAGE_UI_DIR "/about.ui", NULL);
++#endif
+         about_dlg = GTK_ABOUT_DIALOG(gtk_builder_get_object(builder, "dlg"));
+ #if FM_CHECK_VERSION(1, 2, 0)
++        GString *comments = g_string_new(_("Lightweight file manager\n"));
+         g_string_append_printf(comments, _("using LibFM ver. %s\n"), fm_version());
+ #endif
+         g_string_append(comments, _("\nDeveloped by Hon Jen Yee (PCMan)"));
diff --git a/pcmanfm.spec b/pcmanfm.spec
index 5fb1ff7..39f19d1 100644
--- a/pcmanfm.spec
+++ b/pcmanfm.spec
@@ -10,7 +10,7 @@
 # git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
 
 %global         usegit      0
-%global         mainrel     1
+%global         mainrel     2
 
 %global         githash     fc8adaab77f2cc9120deaf905f732e6a7ec1a8a4
 %global         shorthash   %(TMP=%githash ; echo ${TMP:0:10})
@@ -43,6 +43,7 @@ Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{mainver}%{?prever}.t
 # From git head e2f4578bd5e89c7a1 data/*.desktop.in
 Source1:	pcmanfm.desktop.in
 Source2:	pcmanfm-desktop-pref.desktop.in
+Patch10:	pcmanfm-1.2.3-about-dlg.patch
 
 BuildRequires:	libfm-gtk-devel >= %{libfm_minver}
 BuildRequires:	menu-cache-devel
@@ -89,6 +90,8 @@ developing applications that use %{name}.
 sh autogen.sh
 %endif
 
+%patch10 -p1 -b .about
+
 # Patch0
 autoreconf -fi
 
@@ -152,6 +155,9 @@ exit 0
 %{_includedir}/pcmanfm-modules.h
 
 %changelog
+* Thu May 21 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.3-2
+- Make about dialog work
+
 * Fri Oct 17 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.3-1
 - 1.2.3
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/pcmanfm.git/commit/?h=f20&id=ec102a52973dc4bc2b5739e7af34dd82124b076a