Add introspection information to a method to toggle the ruler

Version olpc12

Still not replied upstream
http://bugzilla.abisource.com/show_bug.cgi?id=13548

Also add two files in the spec file because build finished in a error

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>

2 files changed, 40 insertions, 1 deletions

diff --git a/abiword.spec b/abiword.spec
index 884d785..3051858 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -5,7 +5,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: %{majorversion}.%{minorversion}.%{microversion}
-Release: 1.git20121011%{?dist}.olpc11
+Release: 1.git20121011%{?dist}.olpc12
 Epoch: 1
 Group: Applications/Editors
 License: GPLv2+
@@ -50,6 +50,8 @@ Patch102: abiword-change-keyboard-focus-logic.diff
 # Avoid crash saving to PDF - SL #4093
 Patch105: fix-pdf-export.diff
 
+Patch106: add_toggle_ruler.diff
+
 BuildRequires: autoconf, libtool
 BuildRequires: desktop-file-utils
 BuildRequires: fribidi-devel, enchant-devel, wv-devel
@@ -105,6 +107,8 @@ Includes and definitions for developing with libabiword.
 %patch102 -p1
 %patch105 -p1
 
+%patch106 -p1
+
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-%{version}
 %patch0 -p1 -b .windowshelppaths
@@ -180,6 +184,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 # Abiword help
 %{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord
 %{_mandir}/man1/abiword.1.gz
+# collaboration
+#%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
+#%{_datadir}/telepathy/clients/AbiCollab.client
+
 
 %files -n libabiword
 %doc $RPM_BUILD_DIR/%{name}-20121011/COPYING $RPM_BUILD_DIR/%{name}-20121011/COPYRIGHT.TXT
diff --git a/add_toggle_ruler.diff b/add_toggle_ruler.diff
new file mode 100644
index 0000000..20c5cf1
--- /dev/null
+++ b/add_toggle_ruler.diff
@@ -0,0 +1,31 @@
+diff -uNr abiword-20121011/src/wp/ap/gtk/abiwidget.cpp abiword-20121011.new/src/wp/ap/gtk/abiwidget.cpp
+--- abiword-20121011/src/wp/ap/gtk/abiwidget.cpp	2013-08-07 13:07:56.071825233 -0300
++++ abiword-20121011.new/src/wp/ap/gtk/abiwidget.cpp	2013-08-07 13:09:19.149423736 -0300
+@@ -1550,6 +1550,14 @@
+ 	return res;
+ }
+ 
++extern "C" void
++abi_widget_toggle_rulers(AbiWidget * abi, gboolean visible)
++{
++	AP_UnixFrame * pFrame = (AP_UnixFrame *) abi->priv->m_pFrame;
++	if(pFrame != NULL)
++	    pFrame->toggleRuler(visible);
++}
++
+ extern "C" gboolean
+ abi_widget_insert_table(AbiWidget * abi, gint32 rows, gint32 cols)
+ {
+diff -uNr abiword-20121011/src/wp/ap/gtk/abiwidget.h abiword-20121011.new/src/wp/ap/gtk/abiwidget.h
+--- abiword-20121011/src/wp/ap/gtk/abiwidget.h	2012-05-25 12:46:20.000000000 -0300
++++ abiword-20121011.new/src/wp/ap/gtk/abiwidget.h	2013-08-07 13:11:52.132842939 -0300
+@@ -428,6 +428,9 @@
+   gboolean abi_widget_edit_header (AbiWidget * w);
+   gboolean abi_widget_edit_footer (AbiWidget * w);
+ 
++  /* rulers methods */
++  void abi_widget_toggle_rulers(AbiWidget * abi, gboolean visible);
++
+   /* table functions */
+   gboolean abi_widget_insert_table(AbiWidget * w, gint32 rows, gint32 cols);
+   gboolean abi_widget_get_mouse_pos(AbiWidget * w, gint32 * x, gint32 * y);