GNOME.org
 

[gnome-notes/115-fix-shortcut-window] gresources: Change to /org/gnome/Notes

commit 94d6f64d8d1a3386a015588567d62f96c40c9968
Author: Isaque Galdino <igaldino gmail com>
Date:   Mon Oct 8 21:52:07 2018 -0300

    gresources: Change to /org/gnome/Notes
    
    Some parts of GNOME Note were already changed to org.gnome.Notes (#95),
    but others weren't, like gresources.
    
    Due to that Notes was unable to find the correct resource path to load
    the shortcuts window (#115). Moving all resources to /org/gnome/Notes
    solved that.
    
    This commit only changes GResources. GSettings is still using
    org.gnome.bijiben.

 data/bjb.gresource.xml       | 8 ++++----
 src/bjb-application.c        | 2 +-
 src/bjb-editor-toolbar.c     | 2 +-
 src/bjb-empty-results-box.c  | 4 ++--
 src/bjb-import-dialog.c      | 2 +-
 src/bjb-main-toolbar.c       | 2 +-
 src/bjb-organize-dialog.c    | 2 +-
 src/bjb-selection-toolbar.c  | 2 +-
 src/bjb-settings-dialog.c    | 2 +-
 src/libbiji/biji-note-obj.c  | 2 +-
 src/libbiji/biji-zeitgeist.c | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/data/bjb.gresource.xml b/data/bjb.gresource.xml
index f3632e7..49c41de 100644
--- a/data/bjb.gresource.xml
+++ b/data/bjb.gresource.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/bijiben">
+  <gresource prefix="/org/gnome/Notes">
     <file alias="Adwaita.css">resources/Adwaita.css</file>
     <file alias="editor-toolbar.ui" compressed="true" 
preprocess="xml-stripblanks">resources/editor-toolbar.ui</file>
     <file alias="thumbnail-frame.png">resources/thumbnail-frame.png</file>
   </gresource>
 
-  <gresource prefix="/org/gnome/bijiben/icons">
+  <gresource prefix="/org/gnome/Notes/icons">
     <file alias="note-symbolic.svg">resources/note-symbolic.svg</file>
   </gresource>
 
-  <gresource prefix="/org/gnome/bijiben/gtk">
+  <gresource prefix="/org/gnome/Notes/gtk">
     <file alias="help-overlay.ui">resources/help-overlay.ui</file>
   </gresource>
     
-  <gresource prefix="/org/gnome/bijiben/ui">
+  <gresource prefix="/org/gnome/Notes/ui">
     <file alias="main-toolbar.ui" preprocess="xml-stripblanks">resources/main-toolbar.ui</file>
     <file alias="organize-dialog.ui" preprocess="xml-stripblanks">resources/organize-dialog.ui</file>
     <file alias="settings-dialog.ui">resources/settings-dialog.ui</file>
diff --git a/src/bjb-application.c b/src/bjb-application.c
index 770650d..4a98c1a 100644
--- a/src/bjb-application.c
+++ b/src/bjb-application.c
@@ -212,7 +212,7 @@ theme_changed (GtkSettings *settings)
         g_autoptr(GFile) file = NULL;
 
         provider = gtk_css_provider_new ();
-        file = g_file_new_for_uri ("resource:///org/gnome/bijiben/Adwaita.css");
+        file = g_file_new_for_uri ("resource:///org/gnome/Notes/Adwaita.css");
         gtk_css_provider_load_from_file (provider, file, NULL);
     }
 
diff --git a/src/bjb-editor-toolbar.c b/src/bjb-editor-toolbar.c
index 57c20f9..c859f66 100644
--- a/src/bjb-editor-toolbar.c
+++ b/src/bjb-editor-toolbar.c
@@ -282,7 +282,7 @@ bjb_editor_toolbar_class_init (BjbEditorToolbarClass *klass)
                                                         G_PARAM_STATIC_STRINGS));
 
   widget_class = GTK_WIDGET_CLASS (klass);
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/bijiben/editor-toolbar.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Notes/editor-toolbar.ui");
 
   gtk_widget_class_bind_template_child (widget_class, BjbEditorToolbar, bold_button);
   gtk_widget_class_bind_template_child (widget_class, BjbEditorToolbar, italic_button);
diff --git a/src/bjb-empty-results-box.c b/src/bjb-empty-results-box.c
index 60ccea4..687e298 100644
--- a/src/bjb-empty-results-box.c
+++ b/src/bjb-empty-results-box.c
@@ -106,7 +106,7 @@ static void
 bjb_empty_results_box_init (BjbEmptyResultsBox *self)
 {
   gtk_icon_theme_add_resource_path (gtk_icon_theme_get_default (),
-                                    "/org/gnome/bijiben/icons");
+                                    "/org/gnome/Notes/icons");
 
   gtk_widget_init_template (GTK_WIDGET (self));
 }
@@ -116,7 +116,7 @@ bjb_empty_results_box_class_init (BjbEmptyResultsBoxClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/bijiben/ui/empty-results-box.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Notes/ui/empty-results-box.ui");
 
   gtk_widget_class_bind_template_child (widget_class, BjbEmptyResultsBox, primary_label);
   gtk_widget_class_bind_template_child (widget_class, BjbEmptyResultsBox, details_label);
diff --git a/src/bjb-import-dialog.c b/src/bjb-import-dialog.c
index 4be6827..cfeeef3 100644
--- a/src/bjb-import-dialog.c
+++ b/src/bjb-import-dialog.c
@@ -157,7 +157,7 @@ bjb_import_dialog_class_init (BjbImportDialogClass *klass)
 
   object_class->constructed = bjb_import_dialog_constructed;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/bijiben/ui/import-dialog.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Notes/ui/import-dialog.ui");
   gtk_widget_class_bind_template_child (widget_class, BjbImportDialog, import_button);
   gtk_widget_class_bind_template_child (widget_class, BjbImportDialog, gnote_label);
   gtk_widget_class_bind_template_child (widget_class, BjbImportDialog, gnote_stack);
diff --git a/src/bjb-main-toolbar.c b/src/bjb-main-toolbar.c
index 6d279bd..b5d96d3 100644
--- a/src/bjb-main-toolbar.c
+++ b/src/bjb-main-toolbar.c
@@ -918,7 +918,7 @@ bjb_main_toolbar_class_init (BjbMainToolbarClass *klass)
 
   g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/bijiben/ui/main-toolbar.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Notes/ui/main-toolbar.ui");
 
   gtk_widget_class_bind_template_child (widget_class, BjbMainToolbar, button_stack);
   gtk_widget_class_bind_template_child (widget_class, BjbMainToolbar, new_button);
diff --git a/src/bjb-organize-dialog.c b/src/bjb-organize-dialog.c
index 6c6ed57..9017618 100644
--- a/src/bjb-organize-dialog.c
+++ b/src/bjb-organize-dialog.c
@@ -405,7 +405,7 @@ bjb_organize_dialog_class_init (BjbOrganizeDialogClass *klass)
 
   g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/bijiben/ui/organize-dialog.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Notes/ui/organize-dialog.ui");
 
   gtk_widget_class_bind_template_child (widget_class, BjbOrganizeDialog, entry);
   gtk_widget_class_bind_template_child (widget_class, BjbOrganizeDialog, view);
diff --git a/src/bjb-selection-toolbar.c b/src/bjb-selection-toolbar.c
index eafa2d3..b72128e 100644
--- a/src/bjb-selection-toolbar.c
+++ b/src/bjb-selection-toolbar.c
@@ -401,7 +401,7 @@ bjb_selection_toolbar_class_init (BjbSelectionToolbarClass *class)
 
   g_object_class_install_property (object_class,PROP_BJB_MAIN_VIEW,properties[PROP_BJB_MAIN_VIEW]);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/bijiben/ui/selection-toolbar.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Notes/ui/selection-toolbar.ui");
 
   gtk_widget_class_bind_template_child (widget_class, BjbSelectionToolbar, button_stack);
   gtk_widget_class_bind_template_child (widget_class, BjbSelectionToolbar, notebook_button);
diff --git a/src/bjb-settings-dialog.c b/src/bjb-settings-dialog.c
index 855d06e..3e39e53 100644
--- a/src/bjb-settings-dialog.c
+++ b/src/bjb-settings-dialog.c
@@ -361,7 +361,7 @@ bjb_settings_dialog_class_init (BjbSettingsDialogClass *klass)
   g_object_class->finalize = bjb_settings_dialog_finalize;
   g_object_class->constructed = bjb_settings_dialog_constructed;
 
-  gtk_widget_class_set_template_from_resource (gtk_widget_class, "/org/gnome/bijiben/ui/settings-dialog.ui");
+  gtk_widget_class_set_template_from_resource (gtk_widget_class, "/org/gnome/Notes/ui/settings-dialog.ui");
 
   gtk_widget_class_bind_template_child (gtk_widget_class, BjbSettingsDialog, color_button);
   gtk_widget_class_bind_template_child (gtk_widget_class, BjbSettingsDialog, font_button);
diff --git a/src/libbiji/biji-note-obj.c b/src/libbiji/biji-note-obj.c
index 45217bf..b84e368 100644
--- a/src/libbiji/biji-note-obj.c
+++ b/src/libbiji/biji-note-obj.c
@@ -679,7 +679,7 @@ biji_note_obj_get_icon (BijiItem *item,
 
   cairo_destroy (cr);
 
-  priv->icon = gd_embed_surface_in_frame (surface, "resource:///org/gnome/bijiben/thumbnail-frame.png",
+  priv->icon = gd_embed_surface_in_frame (surface, "resource:///org/gnome/Notes/thumbnail-frame.png",
                                                 &frame_slice, &frame_slice);
   cairo_surface_destroy (surface);
 
diff --git a/src/libbiji/biji-zeitgeist.c b/src/libbiji/biji-zeitgeist.c
index 0106ad1..95213ae 100644
--- a/src/libbiji/biji-zeitgeist.c
+++ b/src/libbiji/biji-zeitgeist.c
@@ -39,7 +39,7 @@ biji_zeitgeist_init (void)
   ptr_arr = g_ptr_array_new_with_free_func (g_object_unref);
   g_ptr_array_add (ptr_arr, event);
 
-  ds = zeitgeist_data_source_new_full ("org.gnome.bijiben,dataprovider",
+  ds = zeitgeist_data_source_new_full ("org.gnome.Notes,dataprovider",
                                        "Notes dataprovider",
                                        "Logs events about accessed notes",
                                        ptr_arr),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]