rpms/rednotebook/F-10 rednotebook-0.8.4-gtk-2.14.patch, NONE, 1.1 rednotebook.spec, 1.15, 1.16

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/rednotebook/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21032

Modified Files:
	rednotebook.spec 
Added Files:
	rednotebook-0.8.4-gtk-2.14.patch 
Log Message:
* Sat Aug 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1.1
- Make rednotebook work with GTK 2.14 (#518778)


rednotebook-0.8.4-gtk-2.14.patch:
 mainWindow.glade |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

--- NEW FILE rednotebook-0.8.4-gtk-2.14.patch ---
--- rednotebook-0.8.4/rednotebook/files/mainWindow.glade	2009-08-09 21:18:10.000000000 +0200
+++ rednotebook-0.8.4/rednotebook/files/mainWindow.glade.svn	2009-08-29 19:35:43.000000000 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -56,11 +56,8 @@
   </object>
   <object class="GtkWindow" id="mainFrame">
     <property name="window_position">center</property>
-    <accel-groups>
-      <group name="accelgroup1"/>
-    </accel-groups>
-    <signal name="destroy" handler="on_mainFrame_destroy"/>
     <signal name="configure_event" handler="on_mainFrame_configure_event"/>
+    <signal name="delete_event" handler="on_mainFrame_delete_event"/>
     <child>
       <object class="GtkVBox" id="vbox3">
         <property name="visible">True</property>
@@ -163,6 +160,7 @@
                       <object class="GtkImageMenuItem" id="quit">
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">Shutdown RedNotebook. It won't be sent to the tray.</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -431,12 +429,8 @@
                             <child>
                               <object class="GtkComboBoxEntry" id="searchBox">
                                 <property name="visible">True</property>
-                                <property name="model">liststore4</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
                                 </child>
                               </object>
                               <packing>
@@ -2256,7 +2250,6 @@
       <action-widget response="-5">button21</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="stock">gtk-new</property>
@@ -2281,4 +2274,5 @@
     <property name="visible">True</property>
     <property name="stock">gtk-paste</property>
   </object>
+  <object class="GtkAccelGroup" id="accelgroup1"/>
 </interface>


Index: rednotebook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rednotebook/F-10/rednotebook.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- rednotebook.spec	14 Aug 2009 13:06:14 -0000	1.15
+++ rednotebook.spec	29 Aug 2009 18:18:08 -0000	1.16
@@ -2,13 +2,14 @@
 
 Name:           rednotebook
 Version:        0.8.4
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        A desktop diary
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://digitaldump.wordpress.com/projects/rednotebook/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.8.4-gtk-2.14.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
@@ -30,7 +31,7 @@ and does so in style.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .216
 
 %build
 python setup.py build
@@ -71,6 +72,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Sat Aug 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1.1
+- Make rednotebook work with GTK 2.14 (#518778)
+
 * Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.4-1
 - Updated to new upstream version 0.8.4