[gnome-software] Rename the resource path to match with the dbus path
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Rename the resource path to match with the dbus path
- Date: Sat, 26 Jul 2014 15:47:27 +0000 (UTC)
commit 5d5145951e030a41db855b331ee65c87e63513a4
Author: Kalev Lember <kalevlember gmail com>
Date: Sat Jul 26 15:39:11 2014 +0200
Rename the resource path to match with the dbus path
Use /org/gnome/Software instead of /org/gnome/software for the resource
path. This paves the way to use gtk+'s automated menu loading.
src/gnome-software.gresource.xml | 2 +-
src/gs-app-addon-row.c | 2 +-
src/gs-app-folder-dialog.c | 2 +-
src/gs-app-row.c | 2 +-
src/gs-app-tile.c | 2 +-
src/gs-application.c | 6 +++---
src/gs-category-tile.c | 2 +-
src/gs-dbus-helper.c | 2 +-
src/gs-feature-tile.c | 2 +-
src/gs-first-run-dialog.c | 2 +-
src/gs-history-dialog.c | 2 +-
src/gs-popular-tile.c | 2 +-
src/gs-screenshot-image.c | 2 +-
src/gs-shell-category.c | 2 +-
src/gs-shell-details.c | 2 +-
src/gs-shell-installed.c | 2 +-
src/gs-shell-overview.c | 2 +-
src/gs-shell-search.c | 2 +-
src/gs-shell-updates.c | 2 +-
src/gs-shell.c | 2 +-
src/gs-sources-dialog.c | 2 +-
src/gs-star-widget.c | 2 +-
src/gs-update-dialog.c | 2 +-
23 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/src/gnome-software.gresource.xml b/src/gnome-software.gresource.xml
index af4c3cd..ad13a51 100644
--- a/src/gnome-software.gresource.xml
+++ b/src/gnome-software.gresource.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
- <gresource prefix="/org/gnome/software">
+ <gresource prefix="/org/gnome/Software">
<file preprocess="xml-stripblanks">gnome-software.ui</file>
<file preprocess="xml-stripblanks">app-menu.ui</file>
<file preprocess="xml-stripblanks">popular-tile.ui</file>
diff --git a/src/gs-app-addon-row.c b/src/gs-app-addon-row.c
index 00eefdd..81ad708 100644
--- a/src/gs-app-addon-row.c
+++ b/src/gs-app-addon-row.c
@@ -232,7 +232,7 @@ gs_app_addon_row_class_init (GsAppAddonRowClass *klass)
FALSE, G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_SELECTED, pspec);
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/gs-app-addon-row.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-app-addon-row.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsAppAddonRow, name_box);
gtk_widget_class_bind_template_child_private (widget_class, GsAppAddonRow, name_label);
diff --git a/src/gs-app-folder-dialog.c b/src/gs-app-folder-dialog.c
index e5c4a7a..b69b95d 100644
--- a/src/gs-app-folder-dialog.c
+++ b/src/gs-app-folder-dialog.c
@@ -157,7 +157,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/app-folder-dialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsAppFolderDialog, header);
gtk_widget_class_bind_template_child_private (widget_class, GsAppFolderDialog, cancel_button);
diff --git a/src/gs-app-row.c b/src/gs-app-row.c
index f14b9e8..c35b0a1 100644
--- a/src/gs-app-row.c
+++ b/src/gs-app-row.c
@@ -398,7 +398,7 @@ gs_app_row_class_init (GsAppRowClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/gs-app-row.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-app-row.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsAppRow, image);
gtk_widget_class_bind_template_child_private (widget_class, GsAppRow, name_box);
diff --git a/src/gs-app-tile.c b/src/gs-app-tile.c
index e7d10dc..0612dc1 100644
--- a/src/gs-app-tile.c
+++ b/src/gs-app-tile.c
@@ -224,7 +224,7 @@ gs_app_tile_class_init (GsAppTileClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- 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/app-tile.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsAppTile, button);
gtk_widget_class_bind_template_child_private (widget_class, GsAppTile, image);
diff --git a/src/gs-application.c b/src/gs-application.c
index 26dd5c9..3f61846 100644
--- a/src/gs-application.c
+++ b/src/gs-application.c
@@ -197,7 +197,7 @@ gs_application_initialize_ui (GsApplication *app)
DATADIR "/gnome-software/icons/hicolor");
/* set up the app menu */
- builder = gtk_builder_new_from_resource ("/org/gnome/software/app-menu.ui");
+ builder = gtk_builder_new_from_resource ("/org/gnome/Software/app-menu.ui");
app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
gtk_application_set_app_menu (GTK_APPLICATION (app), app_menu);
g_object_unref (builder);
@@ -209,9 +209,9 @@ gs_application_initialize_ui (GsApplication *app)
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_object_get (gtk_settings_get_default (), "gtk-theme-name", &theme, NULL);
if (g_strcmp0 (theme, "HighContrast") == 0) {
- file = g_file_new_for_uri ("resource:///org/gnome/software/gtk-style-hc.css");
+ file = g_file_new_for_uri ("resource:///org/gnome/Software/gtk-style-hc.css");
} else {
- file = g_file_new_for_uri ("resource:///org/gnome/software/gtk-style.css");
+ file = g_file_new_for_uri ("resource:///org/gnome/Software/gtk-style.css");
}
gtk_css_provider_load_from_file (app->provider, file, NULL);
g_object_unref (file);
diff --git a/src/gs-category-tile.c b/src/gs-category-tile.c
index d876bf3..34a8284 100644
--- a/src/gs-category-tile.c
+++ b/src/gs-category-tile.c
@@ -115,7 +115,7 @@ gs_category_tile_class_init (GsCategoryTileClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- 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/category-tile.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsCategoryTile, button);
gtk_widget_class_bind_template_child_private (widget_class, GsCategoryTile, label);
diff --git a/src/gs-dbus-helper.c b/src/gs-dbus-helper.c
index 0812c89..01e87a3 100644
--- a/src/gs-dbus-helper.c
+++ b/src/gs-dbus-helper.c
@@ -367,7 +367,7 @@ gs_dbus_helper_init (GsDbusHelper *dbus_helper)
/* load introspection */
data = g_resource_lookup_data (gs_get_resource (),
- "/org/gnome/software/org.freedesktop.PackageKit.xml",
+ "/org/gnome/Software/org.freedesktop.PackageKit.xml",
G_RESOURCE_LOOKUP_FLAGS_NONE,
NULL);
xml = g_bytes_get_data (data, NULL);
diff --git a/src/gs-feature-tile.c b/src/gs-feature-tile.c
index c0ef2c5..33cc978 100644
--- a/src/gs-feature-tile.c
+++ b/src/gs-feature-tile.c
@@ -223,7 +223,7 @@ gs_feature_tile_class_init (GsFeatureTileClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- 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/feature-tile.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsFeatureTile, button);
gtk_widget_class_bind_template_child_private (widget_class, GsFeatureTile, image);
diff --git a/src/gs-first-run-dialog.c b/src/gs-first-run-dialog.c
index 84a9ae1..3241dd6 100644
--- a/src/gs-first-run-dialog.c
+++ b/src/gs-first-run-dialog.c
@@ -58,7 +58,7 @@ gs_first_run_dialog_class_init (GsFirstRunDialogClass *klass)
{
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/software/gs-first-run-dialog.ui");
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/Software/gs-first-run-dialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsFirstRunDialog, button);
}
diff --git a/src/gs-history-dialog.c b/src/gs-history-dialog.c
index e93ff43..61457f6 100644
--- a/src/gs-history-dialog.c
+++ b/src/gs-history-dialog.c
@@ -232,7 +232,7 @@ gs_history_dialog_class_init (GsHistoryDialogClass *klass)
object_class->finalize = gs_history_dialog_finalize;
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/software/gs-history-dialog.ui");
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/Software/gs-history-dialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsHistoryDialog, list_box);
gtk_widget_class_bind_template_child_private (widget_class, GsHistoryDialog, scrolledwindow);
diff --git a/src/gs-popular-tile.c b/src/gs-popular-tile.c
index 801b87e..ddccee0 100644
--- a/src/gs-popular-tile.c
+++ b/src/gs-popular-tile.c
@@ -182,7 +182,7 @@ gs_popular_tile_class_init (GsPopularTileClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- 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/popular-tile.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsPopularTile, button);
gtk_widget_class_bind_template_child_private (widget_class, GsPopularTile, label);
diff --git a/src/gs-screenshot-image.c b/src/gs-screenshot-image.c
index 3ec692a..ee2e784 100644
--- a/src/gs-screenshot-image.c
+++ b/src/gs-screenshot-image.c
@@ -471,7 +471,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/screenshot-image.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsScreenshotImage, stack);
gtk_widget_class_bind_template_child_private (widget_class, GsScreenshotImage, image1);
diff --git a/src/gs-shell-category.c b/src/gs-shell-category.c
index 284847a..6363320 100644
--- a/src/gs-shell-category.c
+++ b/src/gs-shell-category.c
@@ -307,7 +307,7 @@ gs_shell_category_class_init (GsShellCategoryClass *klass)
object_class->finalize = gs_shell_category_finalize;
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/software/gs-shell-category.ui");
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/Software/gs-shell-category.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsShellCategory, category_detail_grid);
gtk_widget_class_bind_template_child_private (widget_class, GsShellCategory, frame_filter);
diff --git a/src/gs-shell-details.c b/src/gs-shell-details.c
index fc2e906..48d938d 100644
--- a/src/gs-shell-details.c
+++ b/src/gs-shell-details.c
@@ -1382,7 +1382,7 @@ gs_shell_details_class_init (GsShellDetailsClass *klass)
object_class->finalize = gs_shell_details_finalize;
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/gs-shell-details.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-shell-details.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsShellDetails, application_details_icon);
gtk_widget_class_bind_template_child_private (widget_class, GsShellDetails,
application_details_summary);
diff --git a/src/gs-shell-installed.c b/src/gs-shell-installed.c
index a569e71..29fac25 100644
--- a/src/gs-shell-installed.c
+++ b/src/gs-shell-installed.c
@@ -816,7 +816,7 @@ gs_shell_installed_class_init (GsShellInstalledClass *klass)
object_class->finalize = gs_shell_installed_finalize;
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/software/gs-shell-installed.ui");
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/Software/gs-shell-installed.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsShellInstalled, bottom_install);
gtk_widget_class_bind_template_child_private (widget_class, GsShellInstalled, button_folder_add);
diff --git a/src/gs-shell-overview.c b/src/gs-shell-overview.c
index ed8ab1e..c5fdaff 100644
--- a/src/gs-shell-overview.c
+++ b/src/gs-shell-overview.c
@@ -376,7 +376,7 @@ gs_shell_overview_class_init (GsShellOverviewClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/software/gs-shell-overview.ui");
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/Software/gs-shell-overview.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsShellOverview, bin_featured);
gtk_widget_class_bind_template_child_private (widget_class, GsShellOverview, box_overview);
diff --git a/src/gs-shell-search.c b/src/gs-shell-search.c
index 31e6ecb..c458932 100644
--- a/src/gs-shell-search.c
+++ b/src/gs-shell-search.c
@@ -504,7 +504,7 @@ gs_shell_search_class_init (GsShellSearchClass *klass)
object_class->finalize = gs_shell_search_finalize;
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/gs-shell-search.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-shell-search.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsShellSearch, list_box_search);
gtk_widget_class_bind_template_child_private (widget_class, GsShellSearch, scrolledwindow_search);
diff --git a/src/gs-shell-updates.c b/src/gs-shell-updates.c
index a038cc5..1b58afa 100644
--- a/src/gs-shell-updates.c
+++ b/src/gs-shell-updates.c
@@ -884,7 +884,7 @@ gs_shell_updates_class_init (GsShellUpdatesClass *klass)
object_class->finalize = gs_shell_updates_finalize;
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/gs-shell-updates.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-shell-updates.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsShellUpdates, button_updates_mobile);
gtk_widget_class_bind_template_child_private (widget_class, GsShellUpdates, button_updates_offline);
diff --git a/src/gs-shell.c b/src/gs-shell.c
index 4395735..47e7198 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -471,7 +471,7 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can
priv->cancellable = g_object_ref (cancellable);
/* get UI */
- priv->builder = gtk_builder_new_from_resource ("/org/gnome/software/gnome-software.ui");
+ priv->builder = gtk_builder_new_from_resource ("/org/gnome/Software/gnome-software.ui");
priv->main_window = GTK_WINDOW (gtk_builder_get_object (priv->builder, "window_software"));
/* add application specific icons to search path */
diff --git a/src/gs-sources-dialog.c b/src/gs-sources-dialog.c
index ca75244..4e7c915 100644
--- a/src/gs-sources-dialog.c
+++ b/src/gs-sources-dialog.c
@@ -389,7 +389,7 @@ gs_sources_dialog_class_init (GsSourcesDialogClass *klass)
object_class->finalize = gs_sources_dialog_finalize;
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/software/gs-sources-dialog.ui");
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/Software/gs-sources-dialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsSourcesDialog, button_back);
gtk_widget_class_bind_template_child_private (widget_class, GsSourcesDialog, button_remove);
diff --git a/src/gs-star-widget.c b/src/gs-star-widget.c
index 531776a..7fe6eb6 100644
--- a/src/gs-star-widget.c
+++ b/src/gs-star-widget.c
@@ -241,7 +241,7 @@ gs_star_widget_class_init (GsStarWidgetClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT);
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/gs-star-widget.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-star-widget.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsStarWidget, button1);
gtk_widget_class_bind_template_child_private (widget_class, GsStarWidget, button2);
diff --git a/src/gs-update-dialog.c b/src/gs-update-dialog.c
index 8186b4b..cad81d7 100644
--- a/src/gs-update-dialog.c
+++ b/src/gs-update-dialog.c
@@ -373,7 +373,7 @@ gs_update_dialog_class_init (GsUpdateDialogClass *klass)
object_class->finalize = gs_update_dialog_finalize;
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/software/gs-update-dialog.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Software/gs-update-dialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GsUpdateDialog, box_header);
gtk_widget_class_bind_template_child_private (widget_class, GsUpdateDialog, button_back);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
