[roxterm/el6/master: 13/13] - Update to 1.20.2 - Backport to gtk 2.18

[Dan Horák]

commit 7a83812c73e3ef1cf613949e77398a3b1e08867a
Author: Dan Horák <dan at danny.cz>
Date:   Tue Dec 21 16:19:49 2010 +0100

    - Update to 1.20.2
    - Backport to gtk 2.18

 roxterm-1.20.2-gtk.patch |   12 ++++++++++++
 roxterm.spec             |    3 +++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/roxterm-1.20.2-gtk.patch b/roxterm-1.20.2-gtk.patch
new file mode 100644
index 0000000..3a13b0b
--- /dev/null
+++ b/roxterm-1.20.2-gtk.patch
@@ -0,0 +1,12 @@
+diff -up roxterm-1.20.2/src/roxterm.c.gtk roxterm-1.20.2/src/roxterm.c
+--- roxterm-1.20.2/src/roxterm.c.gtk	2010-12-21 13:50:54.000000000 +0100
++++ roxterm-1.20.2/src/roxterm.c	2010-12-21 13:51:27.000000000 +0100
+@@ -2218,7 +2218,7 @@ static void roxterm_resize_window_handle
+     int columns, rows;
+     
+     /* Can't compute size if not realized */
+-    if (!gtk_widget_get_realized(roxterm->widget))
++    if (!GTK_WIDGET_REALIZED(roxterm->widget))
+         return;
+     /* Ignore if maximised or full screen */
+     if (win && (multi_win_is_maximised(win) || multi_win_is_fullscreen(win)))
diff --git a/roxterm.spec b/roxterm.spec
index a22c76a..985cce5 100644
--- a/roxterm.spec
+++ b/roxterm.spec
@@ -7,6 +7,7 @@ Group:          User Interface/X
 License:        GPLv2+
 URL:            http://roxterm.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0:         %{name}-1.20.2-gtk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vte-devel libglade2-devel gtk2-devel dbus-glib-devel desktop-file-utils
@@ -27,6 +28,7 @@ any other X environment.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gtk
 
 %build
 %configure --docdir=%{_defaultdocdir}/%{name}-%{version}
@@ -81,6 +83,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %changelog
 * Mon Dec 20 2010 Dan Horák <dan[at]danny.cz> - 1.20.2-1
 - Update to 1.20.2
+- Backport to gtk 2.18
 
 * Wed Oct 27 2010 Dan Horák <dan[at]danny.cz> - 1.19.4-1
 - Update to 1.19.4