[gitg] Cleanup libgitg resources

[Jesse van den Kieboom <jessevdk src gnome org>]

commit ee889c33561759a2670f228675eeebc9ce657181
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sat Dec 27 13:39:35 2014 +0100

    Cleanup libgitg resources

 libgitg/gitg-authentication-dialog.vala            |    2 +-
 libgitg/gitg-diff-view-options.vala                |    2 +-
 libgitg/gitg-diff-view-request-resource.vala       |    2 +-
 libgitg/gitg-diff-view.vala                        |    2 +-
 libgitg/gitg-repository-list-box.vala              |    2 +-
 libgitg/gitg-sidebar.vala                          |    2 +-
 libgitg/resources/resources.xml                    |   27 ++++++++-----------
 .../{ => ui/diff-view}/diff-view-html-builder.js   |    0
 .../{ => ui/diff-view}/diff-view-options.ui        |    0
 libgitg/resources/{ => ui/diff-view}/diff-view.css |    0
 .../resources/{ => ui/diff-view}/diff-view.html    |    0
 libgitg/resources/{ => ui/diff-view}/diff-view.js  |    0
 .../{ => ui/diff-view}/jquery-2.0.3.min.js         |    0
 .../{ => ui}/gitg-authentication-dialog.ui         |    0
 .../{ => ui}/gitg-repository-list-box-row.ui       |    0
 .../{sidebar-view.ui => ui/gitg-sidebar.ui}        |    0
 16 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/libgitg/gitg-authentication-dialog.vala b/libgitg/gitg-authentication-dialog.vala
index 6468904..1ead549 100644
--- a/libgitg/gitg-authentication-dialog.vala
+++ b/libgitg/gitg-authentication-dialog.vala
@@ -27,7 +27,7 @@ public enum AuthenticationLifeTime
        FOREVER
 }
 
-[GtkTemplate ( ui = "/org/gnome/gitg/gtk/gitg-authentication-dialog.ui" )]
+[GtkTemplate ( ui = "/org/gnome/gitg/ui/gitg-authentication-dialog.ui" )]
 public class AuthenticationDialog : Gtk.Dialog
 {
        [GtkChild ( name = "label_title" )]
diff --git a/libgitg/gitg-diff-view-options.vala b/libgitg/gitg-diff-view-options.vala
index 323cde4..8fae978 100644
--- a/libgitg/gitg-diff-view-options.vala
+++ b/libgitg/gitg-diff-view-options.vala
@@ -20,7 +20,7 @@
 namespace Gitg
 {
 
-[GtkTemplate ( ui = "/org/gnome/gitg/gtk/diff-view/diff-view-options.ui" )]
+[GtkTemplate ( ui = "/org/gnome/gitg/ui/diff-view/diff-view-options.ui" )]
 public class DiffViewOptions : Gtk.Grid
 {
        [GtkChild (name = "switch_changes_inline")]
diff --git a/libgitg/gitg-diff-view-request-resource.vala b/libgitg/gitg-diff-view-request-resource.vala
index 164b04c..82499b9 100644
--- a/libgitg/gitg-diff-view-request-resource.vala
+++ b/libgitg/gitg-diff-view-request-resource.vala
@@ -44,7 +44,7 @@ namespace Gitg
                        // For debugging
                        if (Environment.get_variable("GITG_GTK_DIFF_VIEW_DEBUG") == "local")
                        {
-                               var pre = "/org/gnome/gitg/gtk/diff-view";
+                               var pre = "/org/gnome/gitg/";
 
                                if (path.has_prefix(pre))
                                {
diff --git a/libgitg/gitg-diff-view.vala b/libgitg/gitg-diff-view.vala
index 00dc045..7bab5b8 100644
--- a/libgitg/gitg-diff-view.vala
+++ b/libgitg/gitg-diff-view.vala
@@ -461,7 +461,7 @@ namespace Gitg
                        d_loaded = false;
 
                        // Load the diff base html
-                       var uri = "gitg-diff:///resource/org/gnome/gitg/gtk/diff-view/diff-view.html?viewid=" 
+ s_diff_id.to_string();
+                       var uri = "gitg-diff:///resource/org/gnome/gitg/ui/diff-view/diff-view.html?viewid=" 
+ s_diff_id.to_string();
 
                        uri += "&settings=" + Soup.URI.encode(json_settings(), null);
 
diff --git a/libgitg/gitg-repository-list-box.vala b/libgitg/gitg-repository-list-box.vala
index 393b29e..05d84ba 100644
--- a/libgitg/gitg-repository-list-box.vala
+++ b/libgitg/gitg-repository-list-box.vala
@@ -32,7 +32,7 @@ namespace Gitg
                public signal void repository_activated(Repository repository);
                public signal void show_error(string primary_message, string secondary_message);
 
-               [GtkTemplate (ui = "/org/gnome/gitg/gtk/gitg-repository-list-box-row.ui")]
+               [GtkTemplate (ui = "/org/gnome/gitg/ui/gitg-repository-list-box-row.ui")]
                public class Row : Gtk.ListBoxRow
                {
                        private Repository? d_repository;
diff --git a/libgitg/gitg-sidebar.vala b/libgitg/gitg-sidebar.vala
index 11df833..90a934e 100644
--- a/libgitg/gitg-sidebar.vala
+++ b/libgitg/gitg-sidebar.vala
@@ -195,7 +195,7 @@ public class SidebarStore : Gtk.TreeStore
        }
 }
 
-[GtkTemplate ( ui = "/org/gnome/gitg/gtk/sidebar/sidebar-view.ui" )]
+[GtkTemplate ( ui = "/org/gnome/gitg/ui/gitg-sidebar.ui" )]
 public class Sidebar : Gtk.TreeView
 {
        [GtkChild (name = "column")]
diff --git a/libgitg/resources/resources.xml b/libgitg/resources/resources.xml
index 3c59adc..6368ba6 100644
--- a/libgitg/resources/resources.xml
+++ b/libgitg/resources/resources.xml
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/gitg/gtk/diff-view">
-    <file compressed="true">diff-view.html</file>
-    <file compressed="true">diff-view.js</file>
-    <file compressed="true">diff-view-html-builder.js</file>
-    <file compressed="true">diff-view.css</file>
-    <file compressed="true">jquery-2.0.3.min.js</file>
-  </gresource>
-  <gresource prefix="/org/gnome/gitg/gtk">
-    <file compressed="true" preprocess="xml-stripblanks">gitg-repository-list-box-row.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">gitg-authentication-dialog.ui</file>
-  </gresource>
-  <gresource prefix="/org/gnome/gitg/gtk/sidebar">
-    <file compressed="true">sidebar-view.ui</file>
-  </gresource>
-  <gresource prefix="/org/gnome/gitg/gtk/diff-view">
-    <file compressed="true">diff-view-options.ui</file>
+  <gresource prefix="/org/gnome/gitg">
+    <file compressed="true">ui/diff-view/diff-view.html</file>
+    <file compressed="true">ui/diff-view/diff-view.js</file>
+    <file compressed="true">ui/diff-view/diff-view-html-builder.js</file>
+    <file compressed="true">ui/diff-view/diff-view.css</file>
+    <file compressed="true">ui/diff-view/jquery-2.0.3.min.js</file>
+    <file compressed="true">ui/diff-view/diff-view-options.ui</file>
+
+    <file compressed="true" preprocess="xml-stripblanks">ui/gitg-repository-list-box-row.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">ui/gitg-authentication-dialog.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">ui/gitg-sidebar.ui</file>
   </gresource>
 </gresources>
 
diff --git a/libgitg/resources/diff-view-html-builder.js 
b/libgitg/resources/ui/diff-view/diff-view-html-builder.js
similarity index 100%
rename from libgitg/resources/diff-view-html-builder.js
rename to libgitg/resources/ui/diff-view/diff-view-html-builder.js
diff --git a/libgitg/resources/diff-view-options.ui b/libgitg/resources/ui/diff-view/diff-view-options.ui
similarity index 100%
rename from libgitg/resources/diff-view-options.ui
rename to libgitg/resources/ui/diff-view/diff-view-options.ui
diff --git a/libgitg/resources/diff-view.css b/libgitg/resources/ui/diff-view/diff-view.css
similarity index 100%
rename from libgitg/resources/diff-view.css
rename to libgitg/resources/ui/diff-view/diff-view.css
diff --git a/libgitg/resources/diff-view.html b/libgitg/resources/ui/diff-view/diff-view.html
similarity index 100%
rename from libgitg/resources/diff-view.html
rename to libgitg/resources/ui/diff-view/diff-view.html
diff --git a/libgitg/resources/diff-view.js b/libgitg/resources/ui/diff-view/diff-view.js
similarity index 100%
rename from libgitg/resources/diff-view.js
rename to libgitg/resources/ui/diff-view/diff-view.js
diff --git a/libgitg/resources/jquery-2.0.3.min.js b/libgitg/resources/ui/diff-view/jquery-2.0.3.min.js
similarity index 100%
rename from libgitg/resources/jquery-2.0.3.min.js
rename to libgitg/resources/ui/diff-view/jquery-2.0.3.min.js
diff --git a/libgitg/resources/gitg-authentication-dialog.ui 
b/libgitg/resources/ui/gitg-authentication-dialog.ui
similarity index 100%
rename from libgitg/resources/gitg-authentication-dialog.ui
rename to libgitg/resources/ui/gitg-authentication-dialog.ui
diff --git a/libgitg/resources/gitg-repository-list-box-row.ui 
b/libgitg/resources/ui/gitg-repository-list-box-row.ui
similarity index 100%
rename from libgitg/resources/gitg-repository-list-box-row.ui
rename to libgitg/resources/ui/gitg-repository-list-box-row.ui
diff --git a/libgitg/resources/sidebar-view.ui b/libgitg/resources/ui/gitg-sidebar.ui
similarity index 100%
rename from libgitg/resources/sidebar-view.ui
rename to libgitg/resources/ui/gitg-sidebar.ui