GNOME.org
 

[gnome-panel] applets: rename *-menu.xml to *-menu.ui

commit 49e50ab8e0995b96141a9fad6d81e6dc1681f657
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Oct 28 01:35:49 2016 +0300

    applets: rename *-menu.xml to *-menu.ui

 applets/clock/Makefile.am                          |    2 +-
 applets/clock/{clock-menu.xml => clock-menu.ui}    |    0
 applets/clock/clock.c                              |    2 +-
 applets/clock/clock.gresource.xml                  |    2 +-
 applets/fish/Makefile.am                           |    2 +-
 applets/fish/fish-applet.c                         |    2 +-
 applets/fish/{fish-menu.xml => fish-menu.ui}       |    0
 applets/fish/fish.gresource.xml                    |    2 +-
 applets/wncklet/Makefile.am                        |    4 ++--
 .../{window-list-menu.xml => window-list-menu.ui}  |    0
 applets/wncklet/window-list.c                      |    2 +-
 applets/wncklet/wncklet.gresource.xml              |    4 ++--
 ...witcher-menu.xml => workspace-switcher-menu.ui} |    0
 applets/wncklet/workspace-switcher.c               |    2 +-
 po/POTFILES.in                                     |    8 ++++----
 15 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 328f5c7..c9bedea 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -161,7 +161,7 @@ $(applet_in_files): $(applet_in_files).in Makefile
 
 ui_FILES =             \
        clock.ui        \
-       clock-menu.xml
+       clock-menu.ui
 
 clock-resources.c: clock.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/clock.gresource.xml)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name clock $<
diff --git a/applets/clock/clock-menu.xml b/applets/clock/clock-menu.ui
similarity index 100%
rename from applets/clock/clock-menu.xml
rename to applets/clock/clock-menu.ui
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index 22fe3a2..65a061e 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -1299,7 +1299,7 @@ fill_clock_applet (PanelApplet *applet)
                                         G_N_ELEMENTS (clock_menu_actions),
                                         cd);
        panel_applet_setup_menu_from_resource (PANEL_APPLET (cd->applet),
-                                              CLOCK_RESOURCE_PATH "clock-menu.xml",
+                                              CLOCK_RESOURCE_PATH "clock-menu.ui",
                                               action_group,
                                               GETTEXT_PACKAGE);
 
diff --git a/applets/clock/clock.gresource.xml b/applets/clock/clock.gresource.xml
index acf1adb..cdddfbf 100644
--- a/applets/clock/clock.gresource.xml
+++ b/applets/clock/clock.gresource.xml
@@ -2,7 +2,7 @@
 <gresources>
   <gresource prefix="/org/gnome/panel/applet/clock">
     <file compressed="true">clock.ui</file>
-    <file compressed="true">clock-menu.xml</file>
+    <file compressed="true">clock-menu.ui</file>
     <file alias="icons/clock-face-large.svg">pixmaps/clock-face-large.svg</file>
     <file alias="icons/clock-face-small.svg">pixmaps/clock-face-small.svg</file>
     <file alias="icons/clock-face-small-morning.svg">pixmaps/clock-face-small-morning.svg</file>
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 2817ba4..0925c8b 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -60,7 +60,7 @@ fishbitmaps_DATA =    \
 
 ui_FILES =             \
        fish.ui         \
-       fish-menu.xml
+       fish-menu.ui
 
 fish-resources.c: fish.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/fish.gresource.xml)
        $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fish $<
diff --git a/applets/fish/fish-applet.c b/applets/fish/fish-applet.c
index 60d7285..3d0134d 100644
--- a/applets/fish/fish-applet.c
+++ b/applets/fish/fish-applet.c
@@ -1424,7 +1424,7 @@ fish_applet_fill (FishApplet *fish)
                                         G_N_ELEMENTS (fish_menu_actions),
                                         fish);
        panel_applet_setup_menu_from_resource (applet,
-                                              FISH_RESOURCE_PATH "fish-menu.xml",
+                                              FISH_RESOURCE_PATH "fish-menu.ui",
                                               action_group,
                                               GETTEXT_PACKAGE);
 
diff --git a/applets/fish/fish-menu.xml b/applets/fish/fish-menu.ui
similarity index 100%
rename from applets/fish/fish-menu.xml
rename to applets/fish/fish-menu.ui
diff --git a/applets/fish/fish.gresource.xml b/applets/fish/fish.gresource.xml
index 9261e09..f0240de 100644
--- a/applets/fish/fish.gresource.xml
+++ b/applets/fish/fish.gresource.xml
@@ -2,6 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/panel/applet/fish">
     <file compressed="true">fish.ui</file>
-    <file compressed="true">fish-menu.xml</file>
+    <file compressed="true">fish-menu.ui</file>
   </gresource>
 </gresources>
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index 330cb19..b6339c3 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -57,9 +57,9 @@ $(applet_in_files): $(applet_in_files).in Makefile
 @PANEL_INTLTOOL_PANEL_APPLET_RULE@
 
 ui_FILES =                             \
-       window-list-menu.xml            \
+       window-list-menu.ui             \
        window-list.ui                  \
-       workspace-switcher-menu.xml     \
+       workspace-switcher-menu.ui      \
        workspace-switcher.ui
 
 
diff --git a/applets/wncklet/window-list-menu.xml b/applets/wncklet/window-list-menu.ui
similarity index 100%
rename from applets/wncklet/window-list-menu.xml
rename to applets/wncklet/window-list-menu.ui
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index d6e3367..676e4af 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -406,7 +406,7 @@ window_list_applet_fill (PanelApplet *applet)
                                         G_N_ELEMENTS (tasklist_menu_actions),
                                         tasklist);
        panel_applet_setup_menu_from_resource (PANEL_APPLET (tasklist->applet),
-                                              WNCKLET_RESOURCE_PATH "window-list-menu.xml",
+                                              WNCKLET_RESOURCE_PATH "window-list-menu.ui",
                                               action_group,
                                               GETTEXT_PACKAGE);
 
diff --git a/applets/wncklet/wncklet.gresource.xml b/applets/wncklet/wncklet.gresource.xml
index e4c7eee..0f3db61 100644
--- a/applets/wncklet/wncklet.gresource.xml
+++ b/applets/wncklet/wncklet.gresource.xml
@@ -2,8 +2,8 @@
 <gresources>
   <gresource prefix="/org/gnome/panel/applet/wncklet">
     <file compressed="true">window-list.ui</file>
-    <file compressed="true">window-list-menu.xml</file>
+    <file compressed="true">window-list-menu.ui</file>
     <file compressed="true">workspace-switcher.ui</file>
-    <file compressed="true">workspace-switcher-menu.xml</file>
+    <file compressed="true">workspace-switcher-menu.ui</file>
   </gresource>
 </gresources>
diff --git a/applets/wncklet/workspace-switcher-menu.xml b/applets/wncklet/workspace-switcher-menu.ui
similarity index 100%
rename from applets/wncklet/workspace-switcher-menu.xml
rename to applets/wncklet/workspace-switcher-menu.ui
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index fb1bb01..a9bf1fb 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -367,7 +367,7 @@ workspace_switcher_applet_fill (PanelApplet *applet)
                                         G_N_ELEMENTS (pager_menu_actions),
                                         pager);
        panel_applet_setup_menu_from_resource (PANEL_APPLET (pager->applet),
-                                              WNCKLET_RESOURCE_PATH "workspace-switcher-menu.xml",
+                                              WNCKLET_RESOURCE_PATH "workspace-switcher-menu.ui",
                                               action_group,
                                               GETTEXT_PACKAGE);
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e4a6586..fe20b3a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,12 +6,12 @@ applets/clock/calendar-window.c
 applets/clock/clock.c
 applets/clock/clock-location.c
 applets/clock/clock-location-tile.c
-[type: gettext/glade]applets/clock/clock-menu.xml
+[type: gettext/glade]applets/clock/clock-menu.ui
 [type: gettext/glade]applets/clock/clock.ui
 applets/clock/clock-utils.c
 [type: gettext/ini]applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
 applets/fish/fish-applet.c
-[type: gettext/glade]applets/fish/fish-menu.xml
+[type: gettext/glade]applets/fish/fish-menu.ui
 [type: gettext/glade]applets/fish/fish.ui
 [type: gettext/ini]applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
 applets/notification_area/main.c
@@ -21,12 +21,12 @@ applets/notification_area/na-tray-manager.c
 [type: gettext/ini]applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
 applets/wncklet/showdesktop.c
 applets/wncklet/window-list.c
-[type: gettext/glade]applets/wncklet/window-list-menu.xml
+[type: gettext/glade]applets/wncklet/window-list-menu.ui
 [type: gettext/glade]applets/wncklet/window-list.ui
 applets/wncklet/window-menu.c
 applets/wncklet/wncklet.c
 applets/wncklet/workspace-switcher.c
-[type: gettext/glade]applets/wncklet/workspace-switcher-menu.xml
+[type: gettext/glade]applets/wncklet/workspace-switcher-menu.ui
 [type: gettext/glade]applets/wncklet/workspace-switcher.ui
 data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
 data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]