Index: src/text/fmt/gtk2
===================================================================
--- src/text/fmt/gtk2	(revision 0)
+++ src/text/fmt/gtk2	(revision 0)
@@ -0,0 +1 @@
+link gtk
\ No newline at end of file

Property changes on: src/text/fmt/gtk2
___________________________________________________________________
Added: svn:special
   + *

Index: plugins/ots/xp/AbiOts.cpp
===================================================================
--- plugins/ots/xp/AbiOts.cpp	(revision 30487)
+++ plugins/ots/xp/AbiOts.cpp	(working copy)
@@ -47,7 +47,7 @@
 
 #include <ots/libots.h>
 
-#ifdef TOOLKIT_GTK
+#ifdef TOOLKIT_GTK_ALL
 #include <gtk/gtk.h>
 #include "xap_UnixApp.h"
 #include "xap_UnixDialogHelper.h"
@@ -55,12 +55,16 @@
 
 static const char* Ots_MenuLabel = "&Summarize";
 static const char* Ots_MenuTooltip = "Summarize your document or selected text";
-#ifdef TOOLKIT_GTK
+#ifdef TOOLKIT_GTK_ALL
 
 static int getSummaryPercent(void)
 {
-  std::string ui_path = static_cast<XAP_UnixApp*>(XAP_App::getApp())->getAbiSuiteAppUIDir() + "/ots.xml";
-  
+  std::string ui_path = static_cast<XAP_UnixApp*>(XAP_App::getApp())->getAbiSuiteAppUIDir() 
+#if defined(TOOLKIT_GTK)
+      + "/ots.xml";
+#elif defined(TOOLKIT_GTK2)
+      + "/ots_gtk2.xml";
+#endif
   // load the dialog from the UI file
   GtkBuilder* builder = gtk_builder_new();
   gtk_builder_add_from_file(builder, ui_path.c_str(), NULL);
@@ -197,7 +201,7 @@
   
   EV_Menu_Action* myAction = new EV_Menu_Action(newID,                     // id that the layout said we could use
 						0,                      // no, we don't have a sub menu.
-#ifdef TOOLKIT_GTK
+#ifdef TOOLKIT_GTK_ALL
 						1,                      // yes, we raise a dialog.
 #else
 						0,                      // no dialog
Index: plugins/ots/xp/Makefile.am
===================================================================
--- plugins/ots/xp/Makefile.am	(revision 30487)
+++ plugins/ots/xp/Makefile.am	(working copy)
@@ -10,8 +10,13 @@
 	AbiOts.cpp
 
 uidir=$(ABIWORD_UIDIR)
+if TOOLKIT_GTK2
 ui_DATA = \
+	ots_gtk2.xml	
+else
+ui_DATA = \
 	ots.xml
+endif
 
 EXTRA_DIST = \
 	$(ui_DATA)
Index: plugins/ots/xp/ots_gtk2.xml
===================================================================
--- plugins/ots/xp/ots_gtk2.xml	(revision 0)
+++ plugins/ots/xp/ots_gtk2.xml	(revision 0)
@@ -0,0 +1,138 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="lower">1</property>
+    <property name="page_increment">10</property>
+    <property name="value">20</property>
+    <property name="page_size">10</property>
+    <property name="step_increment">5</property>
+  </object>
+  <object class="GtkDialog" id="otsDlg">
+    <property name="border_width">6</property>
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Summary Percent</property>
+    <property name="type">GTK_WINDOW_TOPLEVEL</property>
+    <property name="window_position">GTK_WIN_POS_NONE</property>
+    <property name="modal">False</property>
+    <property name="resizable">True</property>
+    <property name="destroy_with_parent">False</property>
+    <property name="has_separator">True</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="homogeneous">False</property>
+        <property name="spacing">0</property>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <object class="GtkButton" id="closeBtn">
+                <property name="visible">True</property>
+                <property name="can_default">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="relief">GTK_RELIEF_NORMAL</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">0</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="border_width">6</property>
+            <property name="visible">True</property>
+            <property name="homogeneous">False</property>
+            <property name="spacing">0</property>
+            <child>
+              <object class="GtkLabel" id="summaryLbl">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Summary Percent&lt;/b&gt;</property>
+                <property name="use_underline">False</property>
+                <property name="use_markup">True</property>
+                <property name="justify">GTK_JUSTIFY_LEFT</property>
+                <property name="wrap">False</property>
+                <property name="selectable">False</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0.5</property>
+                <property name="xpad">0</property>
+                <property name="ypad">0</property>
+              </object>
+              <packing>
+                <property name="padding">0</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <property name="homogeneous">False</property>
+                <property name="spacing">0</property>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">      </property>
+                    <property name="use_underline">False</property>
+                    <property name="use_markup">False</property>
+                    <property name="justify">GTK_JUSTIFY_LEFT</property>
+                    <property name="wrap">False</property>
+                    <property name="selectable">False</property>
+                    <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
+                    <property name="xpad">0</property>
+                    <property name="ypad">0</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="summarySpin">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="climb_rate">5</property>
+                    <property name="digits">0</property>
+                    <property name="numeric">True</property>
+                    <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                    <property name="snap_to_ticks">False</property>
+                    <property name="wrap">False</property>
+                    <property name="adjustment">adjustment1</property>
+                  </object>
+                  <packing>
+                    <property name="padding">0</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="padding">6</property>
+                <property name="expand">True</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="padding">6</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-7">closeBtn</action-widget>
+    </action-widgets>
+  </object>
+</interface>
Index: plugins/gdict/unix/GdictAbiPlugin.cpp
===================================================================
--- plugins/gdict/unix/GdictAbiPlugin.cpp	(revision 30487)
+++ plugins/gdict/unix/GdictAbiPlugin.cpp	(working copy)
@@ -154,7 +154,11 @@
   close = GTK_WIDGET (g_list_last (GNOME_DIALOG (gdict_dlg)->buttons)->data);  
   vbox = GNOME_DIALOG(gdict_dlg)->vbox;
   
+#if GTK_CHECK_VERSION(2,15,0)
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, GNOME_PAD_SMALL);	
+#else
+  hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
+#endif
   gtk_container_set_border_width (GTK_CONTAINER (hbox), GNOME_PAD_SMALL);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   
Index: plugins/gdict/Makefile.am
===================================================================
--- plugins/gdict/Makefile.am	(revision 30487)
+++ plugins/gdict/Makefile.am	(working copy)
@@ -1,5 +1,5 @@
 
-if TOOLKIT_GTK
+if TOOLKIT_GTK_ALL
 
 SUBDIRS = unix