Skip to content

GitLab

J
jami-client-gnome
Commit 2da443ea authored by Vladimir Stoiakin's avatar Vladimir Stoiakin Committed by Sébastien Blin
Browse files
Options

change a top-level domain from 'cx' to 'net' 

Change-Id: Ief3d0ad0d7ce6299c738dbfab80a1d3baa8242b0
parent cad40212
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 73 deletions
data/cx.ring.RingGnome.gschema.xml
View file @ 2da443ea
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<schema path="/cx/jami/JamiGnome/" id="cx.ring.RingGnome">
<schema path="/net/jami/JamiGnome/" id="cx.ring.RingGnome">
<key name="start-on-login" type="b">
<default>true</default>
<summary>Start Jami on login.</summary>
......
pixmaps/pixmaps.gresource.xml
View file @ 2da443ea
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/cx/jami/JamiGnome">
<gresource prefix="/net/jami/JamiGnome">
<file alias="jami-symbol-blue">jami.svg</file>
<file alias="jami-logo-blue">logo-jami-standard-coul.svg</file>
<file alias="addressbook_small">addressbook.svg</file>
......
sounds/sounds.gresource.xml
View file @ 2da443ea
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/cx/jami/JamiGnome">
<gresource prefix="/net/jami/JamiGnome">
<file>ringtone_notify.wav</file>
</gresource>
</gresources>
src/accountcreationwizard.cpp
View file @ 2da443ea
......@@ -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);
......
src/accountgeneraltab.cpp
View file @ 2da443ea
......@@ -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);
......
src/accountmigrationview.cpp
View file @ 2da443ea
......@@ -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);
......
src/avatarmanipulation.cpp
View file @ 2da443ea
......@@ -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);
......
src/chatview.cpp
View file @ 2da443ea
......@@ -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);
......
src/currentcallview.cpp
View file @ 2da443ea
......@@ -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);
......
src/dialogs.c
View file @ 2da443ea
......@@ -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);
......
src/generalsettingsview.cpp
View file @ 2da443ea
......@@ -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);
......
src/incomingcallview.cpp
View file @ 2da443ea
......@@ -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);
......
src/mediasettingsview.cpp
View file @ 2da443ea
......@@ -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);
......
src/messagingwidget.cpp
View file @ 2da443ea
......@@ -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);
......
src/native/pixbufmanipulator.cpp
View file @ 2da443ea
......@@ -48,7 +48,7 @@ PixbufManipulator::temporaryItemAvatar() const
{
GError *error = nullptr;
std::shared_ptr<GdkPixbuf> 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
);
......
src/newaccountsettingsview.cpp
View file @ 2da443ea
......@@ -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);
......
src/ring_client.cpp
View file @ 2da443ea
......@@ -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);
......
src/ringmainwindow.cpp
View file @ 2da443ea
......@@ -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);
......
src/ringwelcomeview.cpp
View file @ 2da443ea
......@@ -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);
......
src/usernameregistrationbox.cpp
View file @ 2da443ea
......@@ -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);
......
src/utils/drawing.cpp
View file @ 2da443ea
......@@ -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;
......
src/webkitchatcontainer.cpp
View file @ 2da443ea
......@@ -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
);
......
ui/chatview.ui
View file @ 2da443ea
......@@ -128,7 +128,7 @@
<object class="GtkImage" id="image_invite">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/invite</property>
<property name="resource">/net/jami/JamiGnome/invite</property>
<child internal-child="accessible">
<object class="AtkObject" id="image_invite-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Send Invitation</property>
......@@ -137,10 +137,10 @@
</object>
<object class="GtkImage" id="image_place_call">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/call_start</property>
<property name="resource">/net/jami/JamiGnome/call_start</property>
</object>
<object class="GtkImage" id="image_place_audio_only_call">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/audio_only_call_start</property>
<property name="resource">/net/jami/JamiGnome/audio_only_call_start</property>
</object>
</interface>
ui/currentcallview.ui
View file @ 2da443ea
......@@ -432,7 +432,7 @@
<object class="GtkImage" id="image_chat">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/chat</property>
<property name="resource">/net/jami/JamiGnome/chat</property>
<child internal-child="accessible">
<object class="AtkObject" id="image_chat-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Chat</property>
......@@ -441,7 +441,7 @@
</object>
<object class="GtkImage" id="image_mute_audio">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/mute_audio</property>
<property name="resource">/net/jami/JamiGnome/mute_audio</property>
<child internal-child="accessible">
<object class="AtkObject" id="image_mute_audio-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Mute audio</property>
......@@ -450,7 +450,7 @@
</object>
<object class="GtkImage" id="image_mute_video">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/mute_video</property>
<property name="resource">/net/jami/JamiGnome/mute_video</property>
<child internal-child="accessible">
<object class="AtkObject" id="image_mute_video-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Mute video</property>
......@@ -459,7 +459,7 @@
</object>
<object class="GtkImage" id="image_pause">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/pause</property>
<property name="resource">/net/jami/JamiGnome/pause</property>
<child internal-child="accessible">
<object class="AtkObject" id="image_pause-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Hold</property>
......@@ -468,7 +468,7 @@
</object>
<object class="GtkImage" id="image_transfer">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/transfer</property>
<property name="resource">/net/jami/JamiGnome/transfer</property>
<child internal-child="accessible">
<object class="AtkObject" id="image_transfer-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Transfer</property>
......@@ -477,7 +477,7 @@
</object>
<object class="GtkImage" id="image_end">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/call_end</property>
<property name="resource">/net/jami/JamiGnome/call_end</property>
<child internal-child="accessible">
<object class="AtkObject" id="image_end-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">End call</property>
......@@ -486,7 +486,7 @@
</object>
<object class="GtkImage" id="image_quality">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/quality</property>
<property name="resource">/net/jami/JamiGnome/quality</property>
<child internal-child="accessible">
<object class="AtkObject" id="image_quality-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Video quality</property>
......@@ -495,7 +495,7 @@
</object>
<object class="GtkImage" id="image_record">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/record</property>
<property name="resource">/net/jami/JamiGnome/record</property>
<child internal-child="accessible">
<object class="AtkObject" id="image_record-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Record</property>
......
ui/generalsettingsview.ui
View file @ 2da443ea
......@@ -9,7 +9,7 @@
</object>
<object class="GtkImage" id="image_clear_history">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/clear_history</property>
<property name="resource">/net/jami/JamiGnome/clear_history</property>
</object>
<object class="GtkAdjustment" id="adjustment_history_duration">
<property name="value">0</property>
......
ui/incomingcallview.ui
View file @ 2da443ea
......@@ -224,14 +224,14 @@
</template>
<object class="GtkImage" id="image_accept">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/accept</property>
<property name="resource">/net/jami/JamiGnome/accept</property>
</object>
<object class="GtkImage" id="image_reject">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/call_end</property>
<property name="resource">/net/jami/JamiGnome/call_end</property>
</object>
<object class="GtkImage" id="image_hangup">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/call_end</property>
<property name="resource">/net/jami/JamiGnome/call_end</property>
</object>
</interface>
ui/messagingwidget.ui
View file @ 2da443ea
......@@ -23,7 +23,7 @@
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/record</property>
<property name="resource">/net/jami/JamiGnome/record</property>
<child internal-child="accessible">
<object class="AtkObject" id="image_record-atkobject">
<property name="AtkObject::accessible-description" translatable="yes">Record</property>
......@@ -107,18 +107,18 @@
</template>
<object class="GtkImage" id="image_record_audio">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/record_audio</property>
<property name="resource">/net/jami/JamiGnome/record_audio</property>
</object>
<object class="GtkImage" id="image_stop">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/stop</property>
<property name="resource">/net/jami/JamiGnome/stop</property>
</object>
<object class="GtkImage" id="image_end_without_message">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/quit</property>
<property name="resource">/net/jami/JamiGnome/quit</property>
</object>
<object class="GtkImage" id="image_send">
<property name="visible">True</property>
<property name="resource">/cx/jami/JamiGnome/send</property>
<property name="resource">/net/jami/JamiGnome/send</property>
</object>
</interface>
ui/ringmainwindow.ui
View file @ 2da443ea
......@@ -23,7 +23,7 @@
<object class="GtkImage" id="image_history">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="resource">/cx/jami/JamiGnome/history_small</property>
<property name="resource">/net/jami/JamiGnome/history_small</property>
</object>
<object class="GtkImage" id="image_media_settings">
<property name="visible">True</property>
......@@ -272,7 +272,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Conversations</property>
<property name="hexpand">True</property>
<property name="resource">/cx/jami/JamiGnome/conversations_list</property>
<property name="resource">/net/jami/JamiGnome/conversations_list</property>
</object>
</child>
</object>
......@@ -305,7 +305,7 @@
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Contact requests</property>
<property name="hexpand">True</property>
<property name="resource">/cx/jami/JamiGnome/contact_requests_list</property>
<property name="resource">/net/jami/JamiGnome/contact_requests_list</property>
</object>
</child>
</object>
......@@ -350,6 +350,6 @@
<object class="GtkImage" id="image_presence">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="resource">/cx/jami/JamiGnome/users_small</property>
<property name="resource">/net/jami/JamiGnome/users_small</property>
</object>
</interface>
ui/ui.gresource.xml
View file @ 2da443ea
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/cx/jami/JamiGnome">
<gresource prefix="/net/jami/JamiGnome">
<file preprocess="xml-stripblanks">ringmainwindow.ui</file>
<file preprocess="xml-stripblanks">ringgearsmenu.ui</file>
<file preprocess="xml-stripblanks">incomingcallview.ui</file>
......
web/web.gresource.xml
View file @ 2da443ea
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/cx/jami/JamiGnome">
<gresource prefix="/net/jami/JamiGnome">
<!-- HTML -->
<file>chatview.html</file>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment