diff --git a/data/cx.ring.RingGnome.gschema.xml b/data/cx.ring.RingGnome.gschema.xml index 4de346aade5daac8d0173cc7e44dba9d66d9b784..68770ffd27f1575ca51b188b229ccfa46d5202eb 100644 --- a/data/cx.ring.RingGnome.gschema.xml +++ b/data/cx.ring.RingGnome.gschema.xml @@ -1,6 +1,6 @@ - + true Start Jami on login. diff --git a/pixmaps/pixmaps.gresource.xml b/pixmaps/pixmaps.gresource.xml index 27de5f86f99eea132309144113b37d880b150026..61ae7a7687bfe4f3f2dd7eff752803818578ef64 100644 --- a/pixmaps/pixmaps.gresource.xml +++ b/pixmaps/pixmaps.gresource.xml @@ -1,6 +1,6 @@ - + jami.svg logo-jami-standard-coul.svg addressbook.svg diff --git a/sounds/sounds.gresource.xml b/sounds/sounds.gresource.xml index 3064e54a77eed61fe595b460f8975c18a946582f..9913fab54d4f91bd4f958a57758b49bd49ac2613 100644 --- a/sounds/sounds.gresource.xml +++ b/sounds/sounds.gresource.xml @@ -1,6 +1,6 @@ - + ringtone_notify.wav diff --git a/src/accountcreationwizard.cpp b/src/accountcreationwizard.cpp index e6361c068474ebcfcd132ad75f2fd8dd8cdfdc80..beab80af62650639d7f18cdabafd7fbfc621f992 100644 --- a/src/accountcreationwizard.cpp +++ b/src/accountcreationwizard.cpp @@ -135,7 +135,7 @@ account_creation_wizard_class_init(AccountCreationWizardClass *klass) G_OBJECT_CLASS(klass)->dispose = account_creation_wizard_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/accountcreationwizard.ui"); + "/net/jami/JamiGnome/accountcreationwizard.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, stack_account_creation); @@ -512,7 +512,7 @@ build_creation_wizard_view(AccountCreationWizard *view, gboolean show_cancel_but /* set ring logo */ GError *error = NULL; - GdkPixbuf* logo_ring = gdk_pixbuf_new_from_resource_at_scale("/cx/jami/JamiGnome/jami-logo-blue", + GdkPixbuf* logo_ring = gdk_pixbuf_new_from_resource_at_scale("/net/jami/JamiGnome/jami-logo-blue", -1, 50, TRUE, &error); if (logo_ring == NULL) { g_debug("Could not load logo: %s", error->message); diff --git a/src/accountgeneraltab.cpp b/src/accountgeneraltab.cpp index 6a12d297adccedd5cf195f3b53f9c02eba9dc2ac..07f480b689063703300d672f4eccfb919644b9e7 100644 --- a/src/accountgeneraltab.cpp +++ b/src/accountgeneraltab.cpp @@ -126,7 +126,7 @@ account_general_tab_class_init(AccountGeneralTabClass *klass) G_OBJECT_CLASS(klass)->dispose = account_general_tab_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/accountgeneraltab.ui"); + "/net/jami/JamiGnome/accountgeneraltab.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, stack_account_general); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountGeneralTab, account_general); @@ -409,13 +409,13 @@ replace_name_from_row(GtkWidget* row, const std::string& name, const std::string auto* new_label_name = gtk_label_new(name.c_str()); gtk_container_add(GTK_CONTAINER(box_info->data), new_label_name); gtk_widget_set_halign(GTK_WIDGET(new_label_name), GTK_ALIGN_START); - auto image = gtk_image_new_from_resource("/cx/jami/JamiGnome/edit"); + auto image = gtk_image_new_from_resource("/net/jami/JamiGnome/edit"); gtk_button_set_image(GTK_BUTTON(action_button->data), image); } else { auto* entry_name = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(entry_name), name.c_str()); gtk_container_add(GTK_CONTAINER(box_info->data), entry_name); - auto image = gtk_image_new_from_resource("/cx/jami/JamiGnome/save"); + auto image = gtk_image_new_from_resource("/net/jami/JamiGnome/save"); gtk_button_set_image(GTK_BUTTON(action_button->data), image); } auto* new_label_id = gtk_label_new(""); @@ -553,9 +553,9 @@ add_device(AccountGeneralTab *view, const lrc::api::Device& device) gtk_container_add(GTK_CONTAINER(device_info_box), label_id); gtk_container_add(GTK_CONTAINER(device_box), device_info_box); // Add action button - auto image = gtk_image_new_from_resource("/cx/jami/JamiGnome/edit"); + auto image = gtk_image_new_from_resource("/net/jami/JamiGnome/edit"); if (!device.isCurrent) - image = gtk_image_new_from_resource("/cx/jami/JamiGnome/revoke"); + image = gtk_image_new_from_resource("/net/jami/JamiGnome/revoke"); auto* action_device_button = gtk_button_new(); gtk_widget_set_tooltip_text(action_device_button, device.isCurrent ? _("Save name") : _("Revoke device")); gtk_button_set_image(GTK_BUTTON(action_device_button), image); diff --git a/src/accountmigrationview.cpp b/src/accountmigrationview.cpp index 660759828525a271f723e41d9975a3d148608a26..aaea53daa69d8a38975aaf0437227c0c0f3e4176 100644 --- a/src/accountmigrationview.cpp +++ b/src/accountmigrationview.cpp @@ -105,7 +105,7 @@ account_migration_view_class_init(AccountMigrationViewClass *klass) G_OBJECT_CLASS(klass)->dispose = account_migration_view_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/accountmigrationview.ui"); + "/net/jami/JamiGnome/accountmigrationview.ui"); /* main_view */ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, main_view); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, label_account_alias); diff --git a/src/avatarmanipulation.cpp b/src/avatarmanipulation.cpp index e8a94060810425df5989a5b86812da2306f41184..ec2b35a97f567f160626a7be214efa7e86007da6 100644 --- a/src/avatarmanipulation.cpp +++ b/src/avatarmanipulation.cpp @@ -176,7 +176,7 @@ avatar_manipulation_class_init(AvatarManipulationClass *klass) G_OBJECT_CLASS(klass)->finalize = avatar_manipulation_finalize; G_OBJECT_CLASS(klass)->dispose = avatar_manipulation_dispose; - gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), "/cx/jami/JamiGnome/avatarmanipulation.ui"); + gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), "/net/jami/JamiGnome/avatarmanipulation.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AvatarManipulation, box_views_and_controls); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AvatarManipulation, box_controls); diff --git a/src/chatview.cpp b/src/chatview.cpp index 2991bbb7fc8be4ad39d19b9b9c4e4a850c9a062c..89224946fde178cde318eb3b1c0eb4bec4443939 100644 --- a/src/chatview.cpp +++ b/src/chatview.cpp @@ -319,7 +319,7 @@ chat_view_class_init(ChatViewClass *klass) G_OBJECT_CLASS(klass)->dispose = chat_view_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/chatview.ui"); + "/net/jami/JamiGnome/chatview.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), ChatView, box_webkit_chat_container); diff --git a/src/currentcallview.cpp b/src/currentcallview.cpp index 9a8aade3e8c85f00c1ff9af614c8a79f8c2af86b..f8772a68051e5ef08ae9926994909f0ab800f7ec 100644 --- a/src/currentcallview.cpp +++ b/src/currentcallview.cpp @@ -382,9 +382,9 @@ on_togglebutton_muteaudio_clicked(CurrentCallView* view) lrc::api::NewCallModel::Media::AUDIO); auto togglebutton = GTK_TOGGLE_BUTTON(priv->togglebutton_muteaudio); - auto image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/mute_audio"); + auto image = gtk_image_new_from_resource ("/net/jami/JamiGnome/mute_audio"); if (gtk_toggle_button_get_active(togglebutton)) - image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/unmute_audio"); + image = gtk_image_new_from_resource ("/net/jami/JamiGnome/unmute_audio"); gtk_button_set_image(GTK_BUTTON(togglebutton), image); } @@ -402,9 +402,9 @@ on_togglebutton_mutevideo_clicked(CurrentCallView* view) lrc::api::NewCallModel::Media::VIDEO); auto togglebutton = GTK_TOGGLE_BUTTON(priv->togglebutton_mutevideo); - auto image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/mute_video"); + auto image = gtk_image_new_from_resource ("/net/jami/JamiGnome/mute_video"); if (gtk_toggle_button_get_active(togglebutton)) - image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/unmute_video"); + image = gtk_image_new_from_resource ("/net/jami/JamiGnome/unmute_video"); gtk_button_set_image(GTK_BUTTON(togglebutton), image); } @@ -1035,26 +1035,26 @@ CppImpl::updateState() auto call = (*accountInfo)->callModel->getCall(callId); auto pauseBtn = GTK_TOGGLE_BUTTON(widgets->togglebutton_hold); - auto image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/pause"); + auto image = gtk_image_new_from_resource ("/net/jami/JamiGnome/pause"); if (call.status == lrc::api::call::Status::PAUSED) - image = gtk_image_new_from_resource ("/cx/jami/JamiGnome/play"); + image = gtk_image_new_from_resource ("/net/jami/JamiGnome/play"); gtk_button_set_image(GTK_BUTTON(pauseBtn), image); auto audioButton = GTK_TOGGLE_BUTTON(widgets->togglebutton_muteaudio); gtk_widget_set_sensitive(GTK_WIDGET(widgets->togglebutton_muteaudio), (call.type != lrc::api::call::Type::CONFERENCE)); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->togglebutton_muteaudio), call.audioMuted); - auto imageMuteAudio = gtk_image_new_from_resource ("/cx/jami/JamiGnome/mute_audio"); + auto imageMuteAudio = gtk_image_new_from_resource ("/net/jami/JamiGnome/mute_audio"); if (call.audioMuted) - imageMuteAudio = gtk_image_new_from_resource ("/cx/jami/JamiGnome/unmute_audio"); + imageMuteAudio = gtk_image_new_from_resource ("/net/jami/JamiGnome/unmute_audio"); gtk_button_set_image(GTK_BUTTON(audioButton), imageMuteAudio); if (!call.isAudioOnly) { auto videoButton = GTK_TOGGLE_BUTTON(widgets->togglebutton_mutevideo); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->togglebutton_mutevideo), call.videoMuted); - auto imageMuteVideo = gtk_image_new_from_resource ("/cx/jami/JamiGnome/mute_video"); + auto imageMuteVideo = gtk_image_new_from_resource ("/net/jami/JamiGnome/mute_video"); if (call.videoMuted) - imageMuteVideo = gtk_image_new_from_resource ("/cx/jami/JamiGnome/unmute_video"); + imageMuteVideo = gtk_image_new_from_resource ("/net/jami/JamiGnome/unmute_video"); gtk_button_set_image(GTK_BUTTON(videoButton), imageMuteVideo); gtk_widget_set_sensitive(GTK_WIDGET(widgets->togglebutton_mutevideo), (call.type != lrc::api::call::Type::CONFERENCE)); @@ -1255,7 +1255,7 @@ current_call_view_class_init(CurrentCallViewClass *klass) G_OBJECT_CLASS(klass)->dispose = current_call_view_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/currentcallview.ui"); + "/net/jami/JamiGnome/currentcallview.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), CurrentCallView, hbox_call_info); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), CurrentCallView, hbox_call_status); diff --git a/src/dialogs.c b/src/dialogs.c index 6d2a5e13c6eb0df9c8e3f20aac8343a78e619612..712540cbe317927b0480c74c2d71cda97bb19d0c 100644 --- a/src/dialogs.c +++ b/src/dialogs.c @@ -74,7 +74,7 @@ ring_about_dialog(GtkWidget *parent) /* get logo */ GError *error = NULL; - GdkPixbuf* logo = gdk_pixbuf_new_from_resource("/cx/jami/JamiGnome/jami-logo-blue", &error); + GdkPixbuf* logo = gdk_pixbuf_new_from_resource("/net/jami/JamiGnome/jami-logo-blue", &error); if (logo == NULL) { g_debug("Could not load logo: %s", error->message); g_clear_error(&error); diff --git a/src/generalsettingsview.cpp b/src/generalsettingsview.cpp index 885642cc54e94140782d3249c2ed5ccfeca1775a..1d547a9eb853ca11ebae1d996ae200cf3ae7aec6 100644 --- a/src/generalsettingsview.cpp +++ b/src/generalsettingsview.cpp @@ -308,7 +308,7 @@ general_settings_view_class_init(GeneralSettingsViewClass *klass) object_class->dispose = general_settings_view_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/generalsettingsview.ui"); + "/net/jami/JamiGnome/generalsettingsview.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_autostart); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), GeneralSettingsView, checkbutton_showstatusicon); diff --git a/src/incomingcallview.cpp b/src/incomingcallview.cpp index e58ff21c14769a30054d09e866a400d3e0d69074..9dede78e9f3ede763e96996269cf0cd835d2cf05 100644 --- a/src/incomingcallview.cpp +++ b/src/incomingcallview.cpp @@ -201,7 +201,7 @@ incoming_call_view_class_init(IncomingCallViewClass *klass) G_OBJECT_CLASS(klass)->dispose = incoming_call_view_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/incomingcallview.ui"); + "/net/jami/JamiGnome/incomingcallview.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, paned_call); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), IncomingCallView, image_incoming); diff --git a/src/mediasettingsview.cpp b/src/mediasettingsview.cpp index e40cf371c5c2640fd7b27a2ce442a373ac7b4a88..b8fbb897182885ba38b53786a617bf326c5cf868 100644 --- a/src/mediasettingsview.cpp +++ b/src/mediasettingsview.cpp @@ -449,7 +449,7 @@ media_settings_view_class_init(MediaSettingsViewClass *klass) G_OBJECT_CLASS(klass)->dispose = media_settings_view_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/mediasettingsview.ui"); + "/net/jami/JamiGnome/mediasettingsview.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, vbox_main); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_manager); diff --git a/src/messagingwidget.cpp b/src/messagingwidget.cpp index 4f57267f4440fab984a181ec44f88e87c290c482..27d98b5616f292c34a0c8ee12ea95bb91f8350ab 100644 --- a/src/messagingwidget.cpp +++ b/src/messagingwidget.cpp @@ -303,7 +303,7 @@ messaging_widget_class_init(MessagingWidgetClass *klass) G_OBJECT_CLASS(klass)->finalize = messaging_widget_finalize; G_OBJECT_CLASS(klass)->dispose = messaging_widget_dispose; - gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), "/cx/jami/JamiGnome/messagingwidget.ui"); + gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), "/net/jami/JamiGnome/messagingwidget.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MessagingWidget, image_send); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MessagingWidget, image_stop); diff --git a/src/native/pixbufmanipulator.cpp b/src/native/pixbufmanipulator.cpp index 14ad3c3f0b2acc16922108e592a0bd34dcb5ab71..8e88d023852fac6cfab905a556d3c6a8b3075ebd 100644 --- a/src/native/pixbufmanipulator.cpp +++ b/src/native/pixbufmanipulator.cpp @@ -48,7 +48,7 @@ PixbufManipulator::temporaryItemAvatar() const { GError *error = nullptr; std::shared_ptr result( - gdk_pixbuf_new_from_resource("/cx/jami/JamiGnome/temporary-item", &error), + gdk_pixbuf_new_from_resource("/net/jami/JamiGnome/temporary-item", &error), g_object_unref ); diff --git a/src/newaccountsettingsview.cpp b/src/newaccountsettingsview.cpp index aeda49381dcd888c336219d2993b515fef7f71cd..300bda1e046752c4c270e5be7709b8c015f94a11 100644 --- a/src/newaccountsettingsview.cpp +++ b/src/newaccountsettingsview.cpp @@ -247,7 +247,7 @@ new_account_settings_view_class_init(NewAccountSettingsViewClass *klass) object_class->dispose = new_account_settings_view_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS(klass), - "/cx/jami/JamiGnome/newaccountsettingsview.ui"); + "/net/jami/JamiGnome/newaccountsettingsview.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS(klass), NewAccountSettingsView, stack_account); diff --git a/src/ring_client.cpp b/src/ring_client.cpp index 05d94d5c4a0ebc606588ec375025eea5c7bbb3d2..58d637fbdb3be6bccbda626a4974b0fd5af382d4 100644 --- a/src/ring_client.cpp +++ b/src/ring_client.cpp @@ -288,7 +288,7 @@ init_systray(RingClient *client) if (!use_appinidcator) { GError *error = NULL; - GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/cx/jami/JamiGnome/jami-symbol-blue", &error); + GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/net/jami/JamiGnome/jami-symbol-blue", &error); if (icon == nullptr) { g_debug("Could not load icon: %s", error->message); g_clear_error(&error); diff --git a/src/ringmainwindow.cpp b/src/ringmainwindow.cpp index 9107390d56d1f70ac2475e209ed9ce1cb255c0b8..872998157dbeb64e30b9fa9b7196f87a17d4064a 100644 --- a/src/ringmainwindow.cpp +++ b/src/ringmainwindow.cpp @@ -242,7 +242,7 @@ render_account_avatar(GtkCellLayout*, g_free(avatar); g_free(id); - GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/cx/jami/JamiGnome/add-device", nullptr); + GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/net/jami/JamiGnome/add-device", nullptr); g_object_set(G_OBJECT(cell), "width", 32, nullptr); g_object_set(G_OBJECT(cell), "height", 32, nullptr); g_object_set(G_OBJECT(cell), "pixbuf", icon, nullptr); @@ -1038,7 +1038,7 @@ CppImpl::init() /* set window icon */ GError *error = NULL; - GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/cx/jami/JamiGnome/jami-symbol-blue", &error); + GdkPixbuf* icon = gdk_pixbuf_new_from_resource("/net/jami/JamiGnome/jami-symbol-blue", &error); if (icon == NULL) { g_debug("Could not load icon: %s", error->message); g_clear_error(&error); @@ -1046,7 +1046,7 @@ CppImpl::init() gtk_window_set_icon(GTK_WINDOW(self), icon); /* set menu icon */ - GdkPixbuf* image_ring = gdk_pixbuf_new_from_resource_at_scale("/cx/jami/JamiGnome/jami-symbol-blue", + GdkPixbuf* image_ring = gdk_pixbuf_new_from_resource_at_scale("/net/jami/JamiGnome/jami-symbol-blue", -1, 16, TRUE, &error); if (image_ring == NULL) { g_debug("Could not load icon: %s", error->message); @@ -1055,7 +1055,7 @@ CppImpl::init() gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->image_ring), image_ring); /* ring menu */ - GtkBuilder *builder = gtk_builder_new_from_resource("/cx/jami/JamiGnome/ringgearsmenu.ui"); + GtkBuilder *builder = gtk_builder_new_from_resource("/net/jami/JamiGnome/ringgearsmenu.ui"); GMenuModel *menu = G_MENU_MODEL(gtk_builder_get_object(builder, "menu")); gtk_menu_button_set_menu_model(GTK_MENU_BUTTON(widgets->ring_menu), menu); g_object_unref(builder); @@ -2264,7 +2264,7 @@ ring_main_window_class_init(RingMainWindowClass *klass) G_OBJECT_CLASS(klass)->dispose = ring_main_window_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/ringmainwindow.ui"); + "/net/jami/JamiGnome/ringmainwindow.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), RingMainWindow, vbox_left_pane); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), RingMainWindow, notebook_contacts); diff --git a/src/ringwelcomeview.cpp b/src/ringwelcomeview.cpp index fc81d7e3d8e346d3174edca423c18ee0c732188e..e17c18e99dc360003e9a87512abe6e21d47261f0 100644 --- a/src/ringwelcomeview.cpp +++ b/src/ringwelcomeview.cpp @@ -135,7 +135,7 @@ ring_welcome_view_init(RingWelcomeView *self) /* get logo */ GError *error = NULL; - GdkPixbuf* logo = gdk_pixbuf_new_from_resource_at_scale("/cx/jami/JamiGnome/jami-logo-blue", + GdkPixbuf* logo = gdk_pixbuf_new_from_resource_at_scale("/net/jami/JamiGnome/jami-logo-blue", 350, -1, TRUE, &error); if (logo == NULL) { g_debug("Could not load logo: %s", error->message); @@ -210,7 +210,7 @@ ring_welcome_view_init(RingWelcomeView *self) /* QR code button */ priv->button_qrcode = gtk_button_new(); - GdkPixbuf *image_qr = gdk_pixbuf_new_from_resource_at_scale("/cx/jami/JamiGnome/qrcode", + GdkPixbuf *image_qr = gdk_pixbuf_new_from_resource_at_scale("/net/jami/JamiGnome/qrcode", -1, 16, TRUE, &error); if (!image_qr) { g_warning("Could not load icon: %s", error->message); diff --git a/src/usernameregistrationbox.cpp b/src/usernameregistrationbox.cpp index 1eaad91190b25bdcfb2dcb09182309a7970dc75e..cfe6d002e18148bee646faeac327a8b74987b83a 100644 --- a/src/usernameregistrationbox.cpp +++ b/src/usernameregistrationbox.cpp @@ -205,7 +205,7 @@ username_registration_box_class_init(UsernameRegistrationBoxClass *klass) G_OBJECT_CLASS(klass)->dispose = username_registration_box_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/usernameregistrationbox.ui"); + "/net/jami/JamiGnome/usernameregistrationbox.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), UsernameRegistrationBox, label_username); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), UsernameRegistrationBox, frame_username); diff --git a/src/utils/drawing.cpp b/src/utils/drawing.cpp index 7d6859373f363af32fa171b5ac49c2fcb8b165c0..5110a014e47444a7382743d8e1350bb83970f7ef 100644 --- a/src/utils/drawing.cpp +++ b/src/utils/drawing.cpp @@ -76,7 +76,7 @@ ring_draw_fallback_avatar(int size, const std::string& letter, const char color) // Compose from fallback svg if no letter found GError *error = nullptr; auto* finalAvatar = gdk_pixbuf_get_from_surface(cairo_get_target(cr), 0, 0, size, size); - auto* fallbackavatar = gdk_pixbuf_new_from_resource_at_scale("/cx/jami/JamiGnome/fallbackavatar", size, size, true, &error); + auto* fallbackavatar = gdk_pixbuf_new_from_resource_at_scale("/net/jami/JamiGnome/fallbackavatar", size, size, true, &error); gdk_pixbuf_composite (fallbackavatar, finalAvatar, 0, 0, size, size, 0, 0, 1, 1, GDK_INTERP_BILINEAR, 0xff); return finalAvatar; diff --git a/src/webkitchatcontainer.cpp b/src/webkitchatcontainer.cpp index 70a0b9fd50e2eb53dc9bd6d9d3d74873581caa41..07f6f4a0256dc734745785ee8e90fbba504cf92c 100644 --- a/src/webkitchatcontainer.cpp +++ b/src/webkitchatcontainer.cpp @@ -97,7 +97,7 @@ webkit_chat_container_class_init(WebKitChatContainerClass *klass) G_OBJECT_CLASS(klass)->dispose = webkit_chat_container_dispose; gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass), - "/cx/jami/JamiGnome/webkitchatcontainer.ui"); + "/net/jami/JamiGnome/webkitchatcontainer.ui"); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), WebKitChatContainer, box_webview_chat); @@ -400,9 +400,9 @@ load_javascript_libs(WebKitWebView *webview_chat, WebKitChatContainerPrivate *priv = WEBKIT_CHAT_CONTAINER_GET_PRIVATE(self); /* Create the list of libraries to load */ - priv->js_libs_to_load = g_list_append(priv->js_libs_to_load, (gchar*) "/cx/jami/JamiGnome/linkify.js"); - priv->js_libs_to_load = g_list_append(priv->js_libs_to_load, (gchar*) "/cx/jami/JamiGnome/linkify-string.js"); - priv->js_libs_to_load = g_list_append(priv->js_libs_to_load, (gchar*) "/cx/jami/JamiGnome/linkify-html.js"); + priv->js_libs_to_load = g_list_append(priv->js_libs_to_load, (gchar*) "/net/jami/JamiGnome/linkify.js"); + priv->js_libs_to_load = g_list_append(priv->js_libs_to_load, (gchar*) "/net/jami/JamiGnome/linkify-string.js"); + priv->js_libs_to_load = g_list_append(priv->js_libs_to_load, (gchar*) "/net/jami/JamiGnome/linkify-html.js"); /* ref the chat view so that its not destroyed while we load * we will unref in javascript_library_loaded @@ -495,7 +495,7 @@ build_view(WebKitChatContainer *view) WebKitUserStyleSheet* chatview_style_sheet = webkit_user_style_sheet_new( (gchar*) g_bytes_get_data( g_resources_lookup_data( - "/cx/jami/JamiGnome/chatview.css", + "/net/jami/JamiGnome/chatview.css", G_RESOURCE_LOOKUP_FLAGS_NONE, NULL ), @@ -544,7 +544,7 @@ build_view(WebKitChatContainer *view) #endif GBytes* chatview_bytes = g_resources_lookup_data( - "/cx/jami/JamiGnome/chatview.html", + "/net/jami/JamiGnome/chatview.html", G_RESOURCE_LOOKUP_FLAGS_NONE, NULL ); diff --git a/ui/chatview.ui b/ui/chatview.ui index 8dc712db7cd4d99d656c41276cc326e94fca4514..7ec70fb59bfafd1599eab03577bbdf786da41215 100644 --- a/ui/chatview.ui +++ b/ui/chatview.ui @@ -128,7 +128,7 @@ True - /cx/jami/JamiGnome/invite + /net/jami/JamiGnome/invite Send Invitation @@ -137,10 +137,10 @@ True - /cx/jami/JamiGnome/call_start + /net/jami/JamiGnome/call_start True - /cx/jami/JamiGnome/audio_only_call_start + /net/jami/JamiGnome/audio_only_call_start diff --git a/ui/currentcallview.ui b/ui/currentcallview.ui index 5a1e4ad3d4da690e2941fcb17d295285d3958045..ec5d8ba69d802e93a4c65988428bda79dd2658d9 100644 --- a/ui/currentcallview.ui +++ b/ui/currentcallview.ui @@ -432,7 +432,7 @@ True - /cx/jami/JamiGnome/chat + /net/jami/JamiGnome/chat Chat @@ -441,7 +441,7 @@ True - /cx/jami/JamiGnome/mute_audio + /net/jami/JamiGnome/mute_audio Mute audio @@ -450,7 +450,7 @@ True - /cx/jami/JamiGnome/mute_video + /net/jami/JamiGnome/mute_video Mute video @@ -459,7 +459,7 @@ True - /cx/jami/JamiGnome/pause + /net/jami/JamiGnome/pause Hold @@ -468,7 +468,7 @@ True - /cx/jami/JamiGnome/transfer + /net/jami/JamiGnome/transfer Transfer @@ -477,7 +477,7 @@ True - /cx/jami/JamiGnome/call_end + /net/jami/JamiGnome/call_end End call @@ -486,7 +486,7 @@ True - /cx/jami/JamiGnome/quality + /net/jami/JamiGnome/quality Video quality @@ -495,7 +495,7 @@ True - /cx/jami/JamiGnome/record + /net/jami/JamiGnome/record Record diff --git a/ui/generalsettingsview.ui b/ui/generalsettingsview.ui index 19523926abbad2edb423cc3e25a5e4f00916e6ad..47078c95e6ff8c345afd1f796c38edf399c88c63 100644 --- a/ui/generalsettingsview.ui +++ b/ui/generalsettingsview.ui @@ -9,7 +9,7 @@ True - /cx/jami/JamiGnome/clear_history + /net/jami/JamiGnome/clear_history 0 diff --git a/ui/incomingcallview.ui b/ui/incomingcallview.ui index a56549da20b9e2d3bc0136160d7732c7776aa6a5..dd7ed18c40b899a44717c280c32c4b3d0cf6931b 100644 --- a/ui/incomingcallview.ui +++ b/ui/incomingcallview.ui @@ -224,14 +224,14 @@ True - /cx/jami/JamiGnome/accept + /net/jami/JamiGnome/accept True - /cx/jami/JamiGnome/call_end + /net/jami/JamiGnome/call_end True - /cx/jami/JamiGnome/call_end + /net/jami/JamiGnome/call_end diff --git a/ui/messagingwidget.ui b/ui/messagingwidget.ui index 5e64be152baa97ad6b6119100bf5b13a16880787..bcc0cf1c719e5bb44577ac7b3f07b2ef816d5b40 100644 --- a/ui/messagingwidget.ui +++ b/ui/messagingwidget.ui @@ -23,7 +23,7 @@ True - /cx/jami/JamiGnome/record + /net/jami/JamiGnome/record Record @@ -107,18 +107,18 @@ True - /cx/jami/JamiGnome/record_audio + /net/jami/JamiGnome/record_audio True - /cx/jami/JamiGnome/stop + /net/jami/JamiGnome/stop True - /cx/jami/JamiGnome/quit + /net/jami/JamiGnome/quit True - /cx/jami/JamiGnome/send + /net/jami/JamiGnome/send diff --git a/ui/ringmainwindow.ui b/ui/ringmainwindow.ui index 96eec26de302c7ec8e24084d204bacaf547d8a10..436790bfd9c9b45930806c4a4d8eb45dbd3d22a6 100644 --- a/ui/ringmainwindow.ui +++ b/ui/ringmainwindow.ui @@ -23,7 +23,7 @@ True False - /cx/jami/JamiGnome/history_small + /net/jami/JamiGnome/history_small True @@ -272,7 +272,7 @@ False Conversations True - /cx/jami/JamiGnome/conversations_list + /net/jami/JamiGnome/conversations_list @@ -305,7 +305,7 @@ False Contact requests True - /cx/jami/JamiGnome/contact_requests_list + /net/jami/JamiGnome/contact_requests_list @@ -350,6 +350,6 @@ True False - /cx/jami/JamiGnome/users_small + /net/jami/JamiGnome/users_small diff --git a/ui/ui.gresource.xml b/ui/ui.gresource.xml index 69857e06455310ab52205a331eba1537e31940d7..5a519b842246a0a55e9b33cc884781e1837088c9 100644 --- a/ui/ui.gresource.xml +++ b/ui/ui.gresource.xml @@ -1,6 +1,6 @@ - + ringmainwindow.ui ringgearsmenu.ui incomingcallview.ui diff --git a/web/web.gresource.xml b/web/web.gresource.xml index abc2d72c1947efad30c9eed4e9c53e654abf3d1d..a67c763d2d81bcafa0da3557f03733cdf6b6d829 100644 --- a/web/web.gresource.xml +++ b/web/web.gresource.xml @@ -1,6 +1,6 @@ - + chatview.html