rpms/ochusha/devel ochusha-D20100214-gtk-deprecated.patch, NONE, 1.1 ochusha.spec, 1.105, 1.106

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16351

Modified Files:
	ochusha.spec 
Added Files:
	ochusha-D20100214-gtk-deprecated.patch 
Log Message:
* Sun Feb 14 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.0.1-0.7.cvs20090728T0130
- Patch to compile with GTK 2.19.3+


ochusha-D20100214-gtk-deprecated.patch:
 libochushagtk_lgpl/mod_notebook.c |   12 +++++++++++-
 ochusha/html_renderer.cc          |    7 ++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE ochusha-D20100214-gtk-deprecated.patch ---
Index: libochushagtk_lgpl/mod_notebook.c
===================================================================
RCS file: /cvsroot/ochusha/ochusha/libochushagtk_lgpl/mod_notebook.c,v
retrieving revision 1.13
diff -u -r1.13 mod_notebook.c
--- libochushagtk_lgpl/mod_notebook.c	4 Nov 2008 12:52:42 -0000	1.13
+++ libochushagtk_lgpl/mod_notebook.c	13 Feb 2010 16:36:07 -0000
@@ -1370,7 +1370,11 @@
    * do this by setting a flag, then propagating the focus motion to the notebook.
    */
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (notebook));
+#if GTK_CHECK_VERSION (2, 19, 3)
+  if (!gtk_widget_is_toplevel (toplevel))
+#else
   if (!GTK_WIDGET_TOPLEVEL (toplevel))
+#endif
     return;
 
   g_object_ref (notebook);
@@ -4054,7 +4058,13 @@
    */
 
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (container));
-  if (toplevel && GTK_WIDGET_TOPLEVEL (toplevel))
+  if (toplevel && 
+#if GTK_CHECK_VERSION (2, 19, 3)
+	gtk_widget_is_toplevel(toplevel) 
+#else
+	GTK_WIDGET_TOPLEVEL (toplevel)
+#endif
+	)
     {
       page_child = GTK_WINDOW (toplevel)->focus_widget; 
       while (page_child)
Index: ochusha/html_renderer.cc
===================================================================
RCS file: /cvsroot/ochusha/ochusha/ochusha/html_renderer.cc,v
retrieving revision 1.30
diff -u -r1.30 html_renderer.cc
--- ochusha/html_renderer.cc	1 Jan 2009 07:47:06 -0000	1.30
+++ ochusha/html_renderer.cc	13 Feb 2010 16:36:07 -0000
@@ -1078,7 +1078,12 @@
     {
       GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(view));
       if (toplevel != NULL
-	  && GTK_WIDGET_TOPLEVEL(toplevel) && GTK_IS_WINDOW(toplevel))
+#if GTK_CHECK_VERSION (2, 19, 3)
+	  && gtk_widget_is_toplevel(toplevel) 
+#else
+	  && GTK_WIDGET_TOPLEVEL(toplevel) 
+#endif
+	  && GTK_IS_WINDOW(toplevel))
 	gtk_window_set_title(GTK_WINDOW(toplevel), title_text.c_str());
 
       return;


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- ochusha.spec	21 Aug 2009 14:48:57 -0000	1.105
+++ ochusha.spec	13 Feb 2010 16:40:21 -0000	1.106
@@ -21,7 +21,7 @@
 %define		strtag		cvs%{codate}T%{cotime_JST}
 %define		repoid		36733
 
-%define		vendor_rel	6
+%define		vendor_rel	7
 %define		pre_release	1
 
 %if %{pre_release}
@@ -42,6 +42,7 @@ Source:		http://downloads.sourceforge.jp
 %endif
 Source10:	ochusha-prefs-gtkrc
 Source11:	ochusha.sh
+Patch0:		ochusha-D20100214-gtk-deprecated.patch
 License:	BSD
 Group:		Applications/Internet
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,6 +75,7 @@ images that helps users to interact with
 %else
 %setup -q
 %endif
+%patch0 -p0 -b .gtk
 
 # Icon path fix
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48|' ochusha/ochusha.desktop.in
@@ -220,6 +222,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
+* Sun Feb 14 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.0.1-0.7.cvs20090728T0130
+- Patch to compile with GTK 2.19.3+
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.0.1-0.6.cvs20090728T0130.1
 - rebuilt with new openssl