GNOME.org
 

[gnome-software] Fix source files to have the same prefix

commit b93f7dd71195a09bb846ef73907fa7726e5aa6ba
Author: Richard Hughes <richard hughsie com>
Date:   Fri Apr 1 11:55:13 2016 +0100

    Fix source files to have the same prefix

 po/POTFILES.in                                     |    8 ++++----
 src/Makefile.am                                    |   20 ++++++++++----------
 src/gnome-software.gresource.xml                   |   18 +++++++++---------
 src/gs-app-folder-dialog.c                         |    2 +-
 ...pp-folder-dialog.ui => gs-app-folder-dialog.ui} |    0
 src/gs-app-tile.c                                  |    2 +-
 src/{app-tile.ui => gs-app-tile.ui}                |    0
 src/gs-category-tile.c                             |    2 +-
 src/{category-tile.ui => gs-category-tile.ui}      |    0
 src/gs-feature-tile.c                              |    2 +-
 src/{feature-tile.ui => gs-feature-tile.ui}        |    0
 src/{menus.ui => gs-menus.ui}                      |    0
 src/gs-popular-tile.c                              |    2 +-
 src/{popular-tile.ui => gs-popular-tile.ui}        |    0
 src/gs-screenshot-image.c                          |    2 +-
 ...{screenshot-image.ui => gs-screenshot-image.ui} |    0
 16 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 17b383f..dcb1383 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,8 +2,8 @@
 # Please keep this file sorted alphabetically.
 data/appdata/org.gnome.Software.appdata.xml.in
 data/org.gnome.software.gschema.xml
-[type: gettext/glade]src/app-folder-dialog.ui
-[type: gettext/glade]src/app-tile.ui
+[type: gettext/glade]src/gs-app-folder-dialog.ui
+[type: gettext/glade]src/gs-app-tile.ui
 src/gnome-software-local-file.desktop.in
 [type: gettext/glade]src/gnome-software.ui
 src/gs-app-addon-row.c
@@ -55,7 +55,7 @@ src/gs-update-monitor.c
 src/gs-upgrade-banner.c
 [type: gettext/glade]src/gs-upgrade-banner.ui
 src/gs-utils.c
-[type: gettext/glade]src/menus.ui
+[type: gettext/glade]src/gs-menus.ui
 src/org.gnome.Software.desktop.in
 src/plugins/menu-spec-common.c
-[type: gettext/glade]src/popular-tile.ui
+[type: gettext/glade]src/gs-popular-tile.ui
diff --git a/src/Makefile.am b/src/Makefile.am
index fae0bf1..21b9fc7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,35 +26,35 @@ desktop_in_files =                                  \
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 UI_FILES =                                             \
-       app-folder-dialog.ui                            \
-       menus.ui                                        \
-       app-tile.ui                                     \
-       category-tile.ui                                \
-       feature-tile.ui                                 \
        gnome-software.ui                               \
        gs-app-addon-row.ui                             \
+       gs-app-folder-dialog.ui                         \
        gs-app-row.ui                                   \
+       gs-app-tile.ui                                  \
+       gs-category-tile.ui                             \
+       gs-feature-tile.ui                              \
        gs-first-run-dialog.ui                          \
        gs-history-dialog.ui                            \
        gs-info-bar.ui                                  \
+       gs-menus.ui                                     \
+       gs-popular-tile.ui                              \
        gs-review-dialog.ui                             \
        gs-review-histogram.ui                          \
        gs-review-row.ui                                \
+       gs-screenshot-image.ui                          \
        gs-shell-category.ui                            \
-       gs-shell-extras.ui                              \
        gs-shell-details.ui                             \
+       gs-shell-extras.ui                              \
        gs-shell-installed.ui                           \
        gs-shell-moderate.ui                            \
        gs-shell-overview.ui                            \
        gs-shell-search.ui                              \
        gs-shell-updates.ui                             \
-       gs-sources-dialog.ui                            \
        gs-sources-dialog-row.ui                        \
+       gs-sources-dialog.ui                            \
        gs-star-widget.ui                               \
        gs-update-dialog.ui                             \
-       gs-upgrade-banner.ui                            \
-       screenshot-image.ui                             \
-       popular-tile.ui
+       gs-upgrade-banner.ui
 
 dbusservicedir = $(datadir)/dbus-1/services
 dbusservice_DATA =                                     \
diff --git a/src/gnome-software.gresource.xml b/src/gnome-software.gresource.xml
index f27026c..c73be6a 100644
--- a/src/gnome-software.gresource.xml
+++ b/src/gnome-software.gresource.xml
@@ -2,31 +2,31 @@
 <gresources>
  <gresource prefix="/org/gnome/Software">
   <file preprocess="xml-stripblanks">gnome-software.ui</file>
-  <file preprocess="xml-stripblanks" alias="gtk/menus.ui">menus.ui</file>
-  <file preprocess="xml-stripblanks">popular-tile.ui</file>
-  <file preprocess="xml-stripblanks">feature-tile.ui</file>
-  <file preprocess="xml-stripblanks">category-tile.ui</file>
-  <file preprocess="xml-stripblanks">app-tile.ui</file>
-  <file preprocess="xml-stripblanks">app-folder-dialog.ui</file>
-  <file preprocess="xml-stripblanks">screenshot-image.ui</file>
+  <file preprocess="xml-stripblanks" alias="gtk/menus.ui">gs-menus.ui</file>
   <file preprocess="xml-stripblanks">gs-app-addon-row.ui</file>
+  <file preprocess="xml-stripblanks">gs-app-folder-dialog.ui</file>
   <file preprocess="xml-stripblanks">gs-app-row.ui</file>
+  <file preprocess="xml-stripblanks">gs-app-tile.ui</file>
+  <file preprocess="xml-stripblanks">gs-category-tile.ui</file>
+  <file preprocess="xml-stripblanks">gs-feature-tile.ui</file>
   <file preprocess="xml-stripblanks">gs-first-run-dialog.ui</file>
   <file preprocess="xml-stripblanks">gs-history-dialog.ui</file>
   <file preprocess="xml-stripblanks">gs-info-bar.ui</file>
+  <file preprocess="xml-stripblanks">gs-popular-tile.ui</file>
   <file preprocess="xml-stripblanks">gs-review-dialog.ui</file>
   <file preprocess="xml-stripblanks">gs-review-histogram.ui</file>
   <file preprocess="xml-stripblanks">gs-review-row.ui</file>
+  <file preprocess="xml-stripblanks">gs-screenshot-image.ui</file>
   <file preprocess="xml-stripblanks">gs-shell-category.ui</file>
-  <file preprocess="xml-stripblanks">gs-shell-extras.ui</file>
   <file preprocess="xml-stripblanks">gs-shell-details.ui</file>
+  <file preprocess="xml-stripblanks">gs-shell-extras.ui</file>
   <file preprocess="xml-stripblanks">gs-shell-installed.ui</file>
   <file preprocess="xml-stripblanks">gs-shell-moderate.ui</file>
   <file preprocess="xml-stripblanks">gs-shell-overview.ui</file>
   <file preprocess="xml-stripblanks">gs-shell-search.ui</file>
   <file preprocess="xml-stripblanks">gs-shell-updates.ui</file>
-  <file preprocess="xml-stripblanks">gs-sources-dialog.ui</file>
   <file preprocess="xml-stripblanks">gs-sources-dialog-row.ui</file>
+  <file preprocess="xml-stripblanks">gs-sources-dialog.ui</file>
   <file preprocess="xml-stripblanks">gs-star-widget.ui</file>
   <file preprocess="xml-stripblanks">gs-update-dialog.ui</file>
   <file preprocess="xml-stripblanks">gs-upgrade-banner.ui</file>
diff --git a/src/gs-app-folder-dialog.c b/src/gs-app-folder-dialog.c
index 2b55179..f6b3d76 100644
--- a/src/gs-app-folder-dialog.c
+++ b/src/gs-app-folder-dialog.c
@@ -146,7 +146,7 @@ gs_app_folder_dialog_class_init (GsAppFolderDialogClass *klass)
 
        widget_class->destroy = gs_app_folder_dialog_destroy;
 
-       gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/Software/app-folder-dialog.ui");
+       gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/Software/gs-app-folder-dialog.ui");
 
        gtk_widget_class_bind_template_child (widget_class, GsAppFolderDialog, cancel_button);
        gtk_widget_class_bind_template_child (widget_class, GsAppFolderDialog, done_button);
diff --git a/src/app-folder-dialog.ui b/src/gs-app-folder-dialog.ui
similarity index 100%
rename from src/app-folder-dialog.ui
rename to src/gs-app-folder-dialog.ui
diff --git a/src/gs-app-tile.c b/src/gs-app-tile.c
index 905484e..7428225 100644
--- a/src/gs-app-tile.c
+++ b/src/gs-app-tile.c
@@ -287,7 +287,7 @@ gs_app_tile_class_init (GsAppTileClass *klass)
                                  -1, G_MAXINT, -1,
                                  G_PARAM_READWRITE));
 
-       gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/app-tile.ui");
+       gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-app-tile.ui");
 
        gtk_widget_class_bind_template_child (widget_class, GsAppTile, image);
        gtk_widget_class_bind_template_child (widget_class, GsAppTile, name);
diff --git a/src/app-tile.ui b/src/gs-app-tile.ui
similarity index 100%
rename from src/app-tile.ui
rename to src/gs-app-tile.ui
diff --git a/src/gs-category-tile.c b/src/gs-category-tile.c
index 1f6956b..10aa9db 100644
--- a/src/gs-category-tile.c
+++ b/src/gs-category-tile.c
@@ -80,7 +80,7 @@ gs_category_tile_class_init (GsCategoryTileClass *klass)
 
        widget_class->destroy = gs_category_tile_destroy;
 
-       gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/category-tile.ui");
+       gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-category-tile.ui");
 
        gtk_widget_class_bind_template_child (widget_class, GsCategoryTile, label);
 }
diff --git a/src/category-tile.ui b/src/gs-category-tile.ui
similarity index 100%
rename from src/category-tile.ui
rename to src/gs-category-tile.ui
diff --git a/src/gs-feature-tile.c b/src/gs-feature-tile.c
index 3ea7254..d72e091 100644
--- a/src/gs-feature-tile.c
+++ b/src/gs-feature-tile.c
@@ -184,7 +184,7 @@ gs_feature_tile_class_init (GsFeatureTileClass *klass)
 
        widget_class->destroy = gs_feature_tile_destroy;
 
-       gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/feature-tile.ui");
+       gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-feature-tile.ui");
 
        gtk_widget_class_bind_template_child (widget_class, GsFeatureTile, image);
        gtk_widget_class_bind_template_child (widget_class, GsFeatureTile, stack);
diff --git a/src/feature-tile.ui b/src/gs-feature-tile.ui
similarity index 100%
rename from src/feature-tile.ui
rename to src/gs-feature-tile.ui
diff --git a/src/menus.ui b/src/gs-menus.ui
similarity index 100%
rename from src/menus.ui
rename to src/gs-menus.ui
diff --git a/src/gs-popular-tile.c b/src/gs-popular-tile.c
index d9c5f4b..d083104 100644
--- a/src/gs-popular-tile.c
+++ b/src/gs-popular-tile.c
@@ -159,7 +159,7 @@ gs_popular_tile_class_init (GsPopularTileClass *klass)
 
        widget_class->destroy = gs_popular_tile_destroy;
 
-       gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/popular-tile.ui");
+       gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-popular-tile.ui");
 
        gtk_widget_class_bind_template_child (widget_class, GsPopularTile, label);
        gtk_widget_class_bind_template_child (widget_class, GsPopularTile, image);
diff --git a/src/popular-tile.ui b/src/gs-popular-tile.ui
similarity index 100%
rename from src/popular-tile.ui
rename to src/gs-popular-tile.ui
diff --git a/src/gs-screenshot-image.c b/src/gs-screenshot-image.c
index 3cd176e..e2f3b76 100644
--- a/src/gs-screenshot-image.c
+++ b/src/gs-screenshot-image.c
@@ -524,7 +524,7 @@ gs_screenshot_image_class_init (GsScreenshotImageClass *klass)
        widget_class->draw = gs_screenshot_image_draw;
 
        gtk_widget_class_set_template_from_resource (widget_class,
-                                                    "/org/gnome/Software/screenshot-image.ui");
+                                                    "/org/gnome/Software/gs-screenshot-image.ui");
 
        gtk_widget_class_bind_template_child (widget_class, GsScreenshotImage, stack);
        gtk_widget_class_bind_template_child (widget_class, GsScreenshotImage, image1);
diff --git a/src/screenshot-image.ui b/src/gs-screenshot-image.ui
similarity index 100%
rename from src/screenshot-image.ui
rename to src/gs-screenshot-image.ui
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]