[gedit] Split common menus to menus-common.ui

[Paolo Borelli <pborelli src gnome org>]

commit 6ad4cb22c443f8b667658225bad33d7e2e4eed87
Author: Paolo Borelli <pborelli gnome org>
Date:   Tue Jul 29 17:42:13 2014 +0200

    Split common menus to menus-common.ui

 configure.ac                             |    2 +-
 gedit/resources/gedit.gresource.xml      |    1 +
 gedit/resources/gtk/menus-common.ui      |   83 ++++++++++++++++++++++++++++++
 gedit/resources/gtk/menus-traditional.ui |   79 ----------------------------
 gedit/resources/gtk/menus.ui             |   79 ----------------------------
 libgd                                    |    2 +-
 6 files changed, 86 insertions(+), 160 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 60c89c9..a8bb5d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -314,7 +314,7 @@ PKG_CHECK_MODULES(GEDIT, [
        glib-2.0 >= 2.39.5
        gio-2.0 >= 2.37.0
        gmodule-2.0
-       gtk+-3.0 >= 3.13.3
+       gtk+-3.0 >= 3.13.6
        gtksourceview-3.0 >= 3.13.2
        libpeas-1.0 >= 1.7.0
        libpeas-gtk-1.0 >= 1.7.0
diff --git a/gedit/resources/gedit.gresource.xml b/gedit/resources/gedit.gresource.xml
index 9daccd5..2b9f954 100644
--- a/gedit/resources/gedit.gresource.xml
+++ b/gedit/resources/gedit.gresource.xml
@@ -2,6 +2,7 @@
 <gresources>
   <gresource prefix="/org/gnome/gedit">
     <file preprocess="xml-stripblanks">gtk/menus.ui</file>
+    <file preprocess="xml-stripblanks">gtk/menus-common.ui</file>
     <file preprocess="xml-stripblanks">gtk/menus-traditional.ui</file>
     <file preprocess="xml-stripblanks">ui/gedit-encodings-dialog.ui</file>
     <file preprocess="xml-stripblanks">ui/gedit-preferences-dialog.ui</file>
diff --git a/gedit/resources/gtk/menus-common.ui b/gedit/resources/gtk/menus-common.ui
new file mode 100644
index 0000000..05efa36
--- /dev/null
+++ b/gedit/resources/gtk/menus-common.ui
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <menu id="notebook-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Move _Left</attribute>
+        <attribute name="action">move-left</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Move _Right</attribute>
+        <attribute name="action">move-right</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Move to New _Window</attribute>
+        <attribute name="action">move-to-new-window</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Move to New Tab _Group</attribute>
+        <attribute name="action">move-to-new-tab-group</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Close</attribute>
+        <attribute name="action">close</attribute>
+      </item>
+    </section>
+  </menu>
+  <menu id="tab-width-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Automatic Indentation</attribute>
+        <attribute name="action">win.auto-indent</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label">2</attribute>
+        <attribute name="action">win.tab-width</attribute>
+        <attribute name="target" type="u">2</attribute>
+      </item>
+      <item>
+        <attribute name="label">4</attribute>
+        <attribute name="action">win.tab-width</attribute>
+        <attribute name="target" type="u">4</attribute>
+      </item>
+      <item>
+        <attribute name="label">8</attribute>
+        <attribute name="action">win.tab-width</attribute>
+        <attribute name="target" type="u">8</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Use Spaces</attribute>
+        <attribute name="action">win.use-spaces</attribute>
+      </item>
+    </section>
+  </menu>
+  <menu id="line-col-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Display line numbers</attribute>
+        <attribute name="action">win.show-line-numbers</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Display right margin</attribute>
+        <attribute name="action">win.display-right-margin</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Highlight current line</attribute>
+        <attribute name="action">win.highlight-current-line</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Text wrapping</attribute>
+        <attribute name="action">win.wrap-mode</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/gedit/resources/gtk/menus-traditional.ui b/gedit/resources/gtk/menus-traditional.ui
index 7a40a93..154329f 100644
--- a/gedit/resources/gtk/menus-traditional.ui
+++ b/gedit/resources/gtk/menus-traditional.ui
@@ -133,83 +133,4 @@
       </item>
     </section>
   </menu>
-  <menu id="notebook-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Move _Left</attribute>
-        <attribute name="action">move-left</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Move _Right</attribute>
-        <attribute name="action">move-right</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Move to New _Window</attribute>
-        <attribute name="action">move-to-new-window</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Move to New Tab _Group</attribute>
-        <attribute name="action">move-to-new-tab-group</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Close</attribute>
-        <attribute name="action">close</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="tab-width-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Automatic Indentation</attribute>
-        <attribute name="action">win.auto-indent</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label">2</attribute>
-        <attribute name="action">win.tab-width</attribute>
-        <attribute name="target" type="u">2</attribute>
-      </item>
-      <item>
-        <attribute name="label">4</attribute>
-        <attribute name="action">win.tab-width</attribute>
-        <attribute name="target" type="u">4</attribute>
-      </item>
-      <item>
-        <attribute name="label">8</attribute>
-        <attribute name="action">win.tab-width</attribute>
-        <attribute name="target" type="u">8</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Use Spaces</attribute>
-        <attribute name="action">win.use-spaces</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="line-col-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Display line numbers</attribute>
-        <attribute name="action">win.show-line-numbers</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Display right margin</attribute>
-        <attribute name="action">win.display-right-margin</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Highlight current line</attribute>
-        <attribute name="action">win.highlight-current-line</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Text wrapping</attribute>
-        <attribute name="action">win.wrap-mode</attribute>
-      </item>
-    </section>
-  </menu>
 </interface>
diff --git a/gedit/resources/gtk/menus.ui b/gedit/resources/gtk/menus.ui
index 501ac42..0acd51d 100644
--- a/gedit/resources/gtk/menus.ui
+++ b/gedit/resources/gtk/menus.ui
@@ -142,83 +142,4 @@
       </item>
     </section>
   </menu>
-  <menu id="notebook-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Move _Left</attribute>
-        <attribute name="action">move-left</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Move _Right</attribute>
-        <attribute name="action">move-right</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Move to New _Window</attribute>
-        <attribute name="action">move-to-new-window</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Move to New Tab _Group</attribute>
-        <attribute name="action">move-to-new-tab-group</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Close</attribute>
-        <attribute name="action">close</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="tab-width-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Automatic Indentation</attribute>
-        <attribute name="action">win.auto-indent</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label">2</attribute>
-        <attribute name="action">win.tab-width</attribute>
-        <attribute name="target" type="u">2</attribute>
-      </item>
-      <item>
-        <attribute name="label">4</attribute>
-        <attribute name="action">win.tab-width</attribute>
-        <attribute name="target" type="u">4</attribute>
-      </item>
-      <item>
-        <attribute name="label">8</attribute>
-        <attribute name="action">win.tab-width</attribute>
-        <attribute name="target" type="u">8</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Use Spaces</attribute>
-        <attribute name="action">win.use-spaces</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="line-col-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Display line numbers</attribute>
-        <attribute name="action">win.show-line-numbers</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Display right margin</attribute>
-        <attribute name="action">win.display-right-margin</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Highlight current line</attribute>
-        <attribute name="action">win.highlight-current-line</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Text wrapping</attribute>
-        <attribute name="action">win.wrap-mode</attribute>
-      </item>
-    </section>
-  </menu>
 </interface>
diff --git a/libgd b/libgd
index 0a9a80e..ac4ae16 160000
--- a/libgd
+++ b/libgd
@@ -1 +1 @@
-Subproject commit 0a9a80e4d38cd9a9e75e5438c7585d765689065f
+Subproject commit ac4ae160ee92fcf7010d0d9420e6f71532627f80