[gnome-weather] Use the proper prefix for our resources
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-weather] Use the proper prefix for our resources
- Date: Wed, 15 Jan 2014 21:56:06 +0000 (UTC)
commit 3200d02917340437ff197e13b5822570c865e12e
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Wed Jan 15 19:57:26 2014 +0100
Use the proper prefix for our resources
Our ID is org.gnome.Weather.Application, so the path should be
/org/gnome/Weather/Application
data/org.gnome.Weather.Application.gresource.xml | 2 +-
src/city.js | 2 +-
src/main.js | 4 ++--
src/window.js | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/data/org.gnome.Weather.Application.gresource.xml
b/data/org.gnome.Weather.Application.gresource.xml
index 35de812..384e249 100644
--- a/data/org.gnome.Weather.Application.gresource.xml
+++ b/data/org.gnome.Weather.Application.gresource.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
- <gresource prefix="/org/gnome/weather">
+ <gresource prefix="/org/gnome/Weather/Application">
<file preprocess="xml-stripblanks">app-menu.ui</file>
<file preprocess="xml-stripblanks">window.ui</file>
<file preprocess="xml-stripblanks">new-location-dialog.ui</file>
diff --git a/src/city.js b/src/city.js
index f71b6f3..e890133 100644
--- a/src/city.js
+++ b/src/city.js
@@ -37,7 +37,7 @@ const WeatherWidget = new Lang.Class({
this._currentStyle = null;
let builder = new Gtk.Builder();
- builder.add_from_resource('/org/gnome/weather/city.ui');
+ builder.add_from_resource('/org/gnome/Weather/Application/city.ui');
let rtl = this.get_direction() == Gtk.TextDirection.RTL;
diff --git a/src/main.js b/src/main.js
index 010eab0..401765d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -67,7 +67,7 @@ const Application = new Lang.Class({
_initAppMenu: function() {
let builder = new Gtk.Builder();
- builder.add_from_resource('/org/gnome/weather/app-menu.ui');
+ builder.add_from_resource('/org/gnome/Weather/Application/app-menu.ui');
let menu = builder.get_object('app-menu');
this.set_app_menu(menu);
@@ -90,7 +90,7 @@ const Application = new Lang.Class({
this.parent();
Gd.ensure_types();
- Util.loadStyleSheet('/org/gnome/weather/application.css');
+ Util.loadStyleSheet('/org/gnome/Weather/Application/application.css');
let settings = Gtk.Settings.get_for_screen(Gdk.Screen.get_default());
settings.gtk_application_prefer_dark_theme = true;
diff --git a/src/window.js b/src/window.js
index 88882ab..b6a2536 100644
--- a/src/window.js
+++ b/src/window.js
@@ -41,7 +41,7 @@ const NewLocationController = new Lang.Class({
_init: function(parentWindow, worldModel) {
this._worldModel = worldModel;
- let builder = Util.loadUI('/org/gnome/weather/new-location-dialog.ui',
+ let builder = Util.loadUI('/org/gnome/Weather/Application/new-location-dialog.ui',
{ 'parent-window': parentWindow });
let dialog = builder.get_object('location-dialog');
@@ -112,7 +112,7 @@ const MainWindow = new Lang.Class({
activate: this.update }]);
let builder = new Gtk.Builder();
- builder.add_from_resource('/org/gnome/weather/window.ui');
+ builder.add_from_resource('/org/gnome/Weather/Application/window.ui');
let grid = builder.get_object('main-panel');
this._header = builder.get_object('header-bar');
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]