From 6e371d2f3fae3e863b20438b040c26a586b5af46 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Sat, 10 Jul 2021 04:15:22 +0200 Subject: [PATCH] resources: Use /org/gnome prefix and adapt to changes In preparation to moving to GNOME all the IDs, DBus object paths, etc should change. --- src/calls-application.c | 2 +- src/calls-call-display.c | 2 +- src/calls-call-record-row.c | 2 +- src/calls-call-selector-item.c | 2 +- src/calls-call-window.c | 2 +- src/calls-contacts-box.c | 2 +- src/calls-contacts-row.c | 2 +- src/calls-encryption-indicator.c | 2 +- src/calls-history-box.c | 2 +- src/calls-in-app-notification.c | 2 +- src/calls-main-window.c | 2 +- src/calls-new-call-box.c | 2 +- src/calls.gresources.xml | 6 +++--- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/calls-application.c b/src/calls-application.c index 7042f0c..54ad861 100644 --- a/src/calls-application.c +++ b/src/calls-application.c @@ -409,7 +409,7 @@ startup (GApplication *application) manager_state_changed_cb (application); provider = gtk_css_provider_new (); - gtk_css_provider_load_from_resource (provider, "/sm/puri/calls/style.css"); + gtk_css_provider_load_from_resource (provider, "/org/gnome/Calls/style.css"); gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); diff --git a/src/calls-call-display.c b/src/calls-call-display.c index bf98958..466fbe2 100644 --- a/src/calls-call-display.c +++ b/src/calls-call-display.c @@ -485,7 +485,7 @@ calls_call_display_class_init (CallsCallDisplayClass *klass) g_object_class_install_properties (object_class, PROP_LAST_PROP, props); - gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/call-display.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/call-display.ui"); gtk_widget_class_bind_template_child (widget_class, CallsCallDisplay, incoming_phone_call); gtk_widget_class_bind_template_child (widget_class, CallsCallDisplay, primary_contact_info); gtk_widget_class_bind_template_child (widget_class, CallsCallDisplay, secondary_contact_info); diff --git a/src/calls-call-record-row.c b/src/calls-call-record-row.c index ebad58d..155e784 100644 --- a/src/calls-call-record-row.c +++ b/src/calls-call-record-row.c @@ -520,7 +520,7 @@ calls_call_record_row_class_init (CallsCallRecordRowClass *klass) g_object_class_install_properties (object_class, PROP_LAST_PROP, props); - gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/call-record-row.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/call-record-row.ui"); gtk_widget_class_bind_template_child (widget_class, CallsCallRecordRow, avatar); gtk_widget_class_bind_template_child (widget_class, CallsCallRecordRow, type); gtk_widget_class_bind_template_child (widget_class, CallsCallRecordRow, target); diff --git a/src/calls-call-selector-item.c b/src/calls-call-selector-item.c index f5410a7..bc928d2 100644 --- a/src/calls-call-selector-item.c +++ b/src/calls-call-selector-item.c @@ -179,7 +179,7 @@ calls_call_selector_item_class_init (CallsCallSelectorItemClass *klass) g_object_class_install_properties (object_class, PROP_LAST_PROP, props); - gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/call-selector-item.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/call-selector-item.ui"); gtk_widget_class_bind_template_child (widget_class, CallsCallSelectorItem, main_box); gtk_widget_class_bind_template_child (widget_class, CallsCallSelectorItem, name); gtk_widget_class_bind_template_child (widget_class, CallsCallSelectorItem, status); diff --git a/src/calls-call-window.c b/src/calls-call-window.c index 1f49cf2..e9c6313 100644 --- a/src/calls-call-window.c +++ b/src/calls-call-window.c @@ -577,7 +577,7 @@ calls_call_window_class_init (CallsCallWindowClass *klass) object_class->notify = notify; #endif // CALLS_WAYLAND - gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/call-window.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/call-window.ui"); gtk_widget_class_bind_template_child (widget_class, CallsCallWindow, in_app_notification); gtk_widget_class_bind_template_child (widget_class, CallsCallWindow, main_stack); gtk_widget_class_bind_template_child (widget_class, CallsCallWindow, header_bar_stack); diff --git a/src/calls-contacts-box.c b/src/calls-contacts-box.c index f346d91..e6429ca 100644 --- a/src/calls-contacts-box.c +++ b/src/calls-contacts-box.c @@ -145,7 +145,7 @@ calls_contacts_box_class_init (CallsContactsBoxClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/contacts-box.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/contacts-box.ui"); gtk_widget_class_bind_template_child (widget_class, CallsContactsBox, contacts_listbox); gtk_widget_class_bind_template_child (widget_class, CallsContactsBox, contacts_frame); gtk_widget_class_bind_template_child (widget_class, CallsContactsBox, search_entry); diff --git a/src/calls-contacts-row.c b/src/calls-contacts-row.c index e2c4b00..6a5b54a 100644 --- a/src/calls-contacts-row.c +++ b/src/calls-contacts-row.c @@ -127,7 +127,7 @@ calls_contacts_row_class_init (CallsContactsRowClass *klass) object_class->dispose = calls_contacts_row_dispose; gtk_widget_class_set_template_from_resource (widget_class, - "/sm/puri/calls/" + "/org/gnome/Calls/" "ui/contacts-row.ui"); gtk_widget_class_bind_template_child (widget_class, CallsContactsRow, avatar); gtk_widget_class_bind_template_child (widget_class, CallsContactsRow, title); diff --git a/src/calls-encryption-indicator.c b/src/calls-encryption-indicator.c index 68676b6..b39267f 100644 --- a/src/calls-encryption-indicator.c +++ b/src/calls-encryption-indicator.c @@ -131,7 +131,7 @@ calls_encryption_indicator_class_init (CallsEncryptionIndicatorClass *klass) G_PARAM_READWRITE); g_object_class_install_properties (object_class, PROP_LAST_PROP, props); - gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/encryption-indicator.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/encryption-indicator.ui"); gtk_widget_class_bind_template_child (widget_class, CallsEncryptionIndicator, is_not_encrypted); gtk_widget_class_bind_template_child (widget_class, CallsEncryptionIndicator, is_encrypted); } diff --git a/src/calls-history-box.c b/src/calls-history-box.c index e9dc900..48602a6 100644 --- a/src/calls-history-box.c +++ b/src/calls-history-box.c @@ -226,7 +226,7 @@ calls_history_box_class_init (CallsHistoryBoxClass *klass) g_object_class_install_properties (object_class, PROP_LAST_PROP, props); - gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/history-box.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/history-box.ui"); gtk_widget_class_bind_template_child (widget_class, CallsHistoryBox, history); } diff --git a/src/calls-in-app-notification.c b/src/calls-in-app-notification.c index 14994eb..018ccf0 100644 --- a/src/calls-in-app-notification.c +++ b/src/calls-in-app-notification.c @@ -128,7 +128,7 @@ calls_in_app_notification_class_init (CallsInAppNotificationClass *klass) g_object_class_install_properties (object_class, PROP_LAST_PROP, props); - gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/in-app-notification.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/in-app-notification.ui"); gtk_widget_class_bind_template_child (widget_class, CallsInAppNotification, label); gtk_widget_class_bind_template_callback (widget_class, calls_in_app_notification_hide); } diff --git a/src/calls-main-window.c b/src/calls-main-window.c index fb2da48..57c3fd3 100644 --- a/src/calls-main-window.c +++ b/src/calls-main-window.c @@ -466,7 +466,7 @@ calls_main_window_class_init (CallsMainWindowClass *klass) widget_class->size_allocate = size_allocate; - gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/main-window.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/main-window.ui"); gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, in_app_notification); gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, title_switcher); gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, main_stack); diff --git a/src/calls-new-call-box.c b/src/calls-new-call-box.c index 91c7691..c5fa120 100644 --- a/src/calls-new-call-box.c +++ b/src/calls-new-call-box.c @@ -270,7 +270,7 @@ calls_new_call_box_class_init (CallsNewCallBoxClass *klass) object_class->dispose = dispose; - gtk_widget_class_set_template_from_resource (widget_class, "/sm/puri/calls/ui/new-call-box.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/new-call-box.ui"); gtk_widget_class_bind_template_child (widget_class, CallsNewCallBox, origin_list_box); gtk_widget_class_bind_template_child (widget_class, CallsNewCallBox, origin_list); gtk_widget_class_bind_template_child (widget_class, CallsNewCallBox, backspace); diff --git a/src/calls.gresources.xml b/src/calls.gresources.xml index e413bc0..9a4e4ca 100644 --- a/src/calls.gresources.xml +++ b/src/calls.gresources.xml @@ -1,6 +1,6 @@ - + main-window.ui call-display.ui call-selector-item.ui @@ -15,10 +15,10 @@ contacts-row.ui contacts-box.ui - + style.css - + new-call-symbolic.svg call-arrow-incoming-symbolic.svg call-arrow-incoming-missed-symbolic.svg