GNOME.org
 

[network-manager-applet/lr/gapplication: 1/4] connection-editor: (trivial) rename the resource base

commit b1b06f66f7759e8543b80bda18805799ae2518ca
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Thu May 17 17:16:45 2018 +0200

    connection-editor: (trivial) rename the resource base
    
    Make it the name we use on D-Bus.

 src/connection-editor/ce.gresource.xml          |    2 +-
 src/connection-editor/connection-helpers.c      |    2 +-
 src/connection-editor/ip4-routes-dialog.c       |    2 +-
 src/connection-editor/ip6-routes-dialog.c       |    2 +-
 src/connection-editor/nm-connection-editor.c    |    4 ++--
 src/connection-editor/nm-connection-list.c      |    2 +-
 src/connection-editor/page-bluetooth.c          |    2 +-
 src/connection-editor/page-bond.c               |    2 +-
 src/connection-editor/page-bridge-port.c        |    2 +-
 src/connection-editor/page-bridge.c             |    2 +-
 src/connection-editor/page-dcb.c                |    2 +-
 src/connection-editor/page-dsl.c                |    2 +-
 src/connection-editor/page-ethernet.c           |    2 +-
 src/connection-editor/page-general.c            |    2 +-
 src/connection-editor/page-infiniband.c         |    2 +-
 src/connection-editor/page-ip-tunnel.c          |    2 +-
 src/connection-editor/page-ip4.c                |    2 +-
 src/connection-editor/page-ip6.c                |    2 +-
 src/connection-editor/page-macsec.c             |    2 +-
 src/connection-editor/page-mobile.c             |    2 +-
 src/connection-editor/page-ppp.c                |    2 +-
 src/connection-editor/page-proxy.c              |    2 +-
 src/connection-editor/page-team-port.c          |    2 +-
 src/connection-editor/page-team.c               |    2 +-
 src/connection-editor/page-vlan.c               |    2 +-
 src/connection-editor/page-wifi-security.c      |    2 +-
 src/connection-editor/page-wifi.c               |    2 +-
 src/connection-editor/ppp-auth-methods-dialog.c |    2 +-
 28 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/src/connection-editor/ce.gresource.xml b/src/connection-editor/ce.gresource.xml
index d0965dc..d404bc3 100644
--- a/src/connection-editor/ce.gresource.xml
+++ b/src/connection-editor/ce.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-       <gresource prefix="/org/freedesktop/network-manager-applet">
+       <gresource prefix="/org/gnome/nm_connection_editor">
                <file preprocess="xml-stripblanks">nm-connection-editor.ui</file>
                <file preprocess="xml-stripblanks">nm-connection-list.ui</file>
                <file preprocess="xml-stripblanks">ce-ip4-routes.ui</file>
diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
index 6261d25..d7a434a 100644
--- a/src/connection-editor/connection-helpers.c
+++ b/src/connection-editor/connection-helpers.c
@@ -633,7 +633,7 @@ new_connection_dialog_full (GtkWindow *parent_window,
        /* load GUI */
        gui = gtk_builder_new ();
        if (!gtk_builder_add_from_resource (gui,
-                                           "/org/freedesktop/network-manager-applet/ce-new-connection.ui",
+                                           "/org/gnome/nm_connection_editor/ce-new-connection.ui",
                                            &error)) {
                g_warning ("Couldn't load builder resource: %s", error->message);
                g_error_free (error);
diff --git a/src/connection-editor/ip4-routes-dialog.c b/src/connection-editor/ip4-routes-dialog.c
index daed6df..4b10552 100644
--- a/src/connection-editor/ip4-routes-dialog.c
+++ b/src/connection-editor/ip4-routes-dialog.c
@@ -623,7 +623,7 @@ ip4_routes_dialog_new (NMSettingIPConfig *s_ip4, gboolean automatic)
 
        builder = gtk_builder_new ();
 
-       if (!gtk_builder_add_from_resource (builder, 
"/org/freedesktop/network-manager-applet/ce-ip4-routes.ui", &error)) {
+       if (!gtk_builder_add_from_resource (builder, "/org/gnome/nm_connection_editor/ce-ip4-routes.ui", 
&error)) {
                g_warning ("Couldn't load builder resource: %s", error->message);
                g_error_free (error);
                return NULL;
diff --git a/src/connection-editor/ip6-routes-dialog.c b/src/connection-editor/ip6-routes-dialog.c
index e92464d..35bb658 100644
--- a/src/connection-editor/ip6-routes-dialog.c
+++ b/src/connection-editor/ip6-routes-dialog.c
@@ -647,7 +647,7 @@ ip6_routes_dialog_new (NMSettingIPConfig *s_ip6, gboolean automatic)
 
        builder = gtk_builder_new ();
 
-       if (!gtk_builder_add_from_resource (builder, 
"/org/freedesktop/network-manager-applet/ce-ip6-routes.ui", &error)) {
+       if (!gtk_builder_add_from_resource (builder, "/org/gnome/nm_connection_editor/ce-ip6-routes.ui", 
&error)) {
                g_warning ("Couldn't load builder resource: %s", error->message);
                g_error_free (error);
                return NULL;
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index 9427718..98f4b5a 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -434,10 +434,10 @@ nm_connection_editor_init (NMConnectionEditor *editor)
        editor->builder = gtk_builder_new ();
 
        if (!gtk_builder_add_objects_from_resource (editor->builder,
-                                                   
"/org/freedesktop/network-manager-applet/nm-connection-editor.ui",
+                                                   "/org/gnome/nm_connection_editor/nm-connection-editor.ui",
                                                    (char **) objects,
                                                    &error)) {
-               g_warning ("Couldn't load builder resource " 
"/org/freedesktop/network-manager-applet/nm-connection-editor.ui: %s", error->message);
+               g_warning ("Couldn't load builder resource " 
"/org/gnome/nm_connection_editor/nm-connection-editor.ui: %s", error->message);
                g_error_free (error);
 
                dialog = gtk_message_dialog_new (NULL, 0,
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index 6eba04d..671e888 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -545,7 +545,7 @@ nm_connection_list_class_init (NMConnectionListClass *klass)
 
        /* Initialize the widget template */
         gtk_widget_class_set_template_from_resource (widget_class,
-                                                    
"/org/freedesktop/network-manager-applet/nm-connection-list.ui");
+                                                    "/org/gnome/nm_connection_editor/nm-connection-list.ui");
 
         gtk_widget_class_bind_template_child_private (widget_class, NMConnectionList, connection_list);
         gtk_widget_class_bind_template_child_private (widget_class, NMConnectionList, connection_add);
diff --git a/src/connection-editor/page-bluetooth.c b/src/connection-editor/page-bluetooth.c
index 633a02d..5d2fa15 100644
--- a/src/connection-editor/page-bluetooth.c
+++ b/src/connection-editor/page-bluetooth.c
@@ -118,7 +118,7 @@ ce_page_bluetooth_new (NMConnectionEditor *editor,
                                  connection,
                                  parent_window,
                                  client,
-                                 "/org/freedesktop/network-manager-applet/ce-page-bluetooth.ui",
+                                 "/org/gnome/nm_connection_editor/ce-page-bluetooth.ui",
                                  "BluetoothPage",
                                  _("Bluetooth")));
        if (!self) {
diff --git a/src/connection-editor/page-bond.c b/src/connection-editor/page-bond.c
index 1e1c48c..76356cb 100644
--- a/src/connection-editor/page-bond.c
+++ b/src/connection-editor/page-bond.c
@@ -441,7 +441,7 @@ ce_page_bond_new (NMConnectionEditor *editor,
                                          connection,
                                          parent_window,
                                          client,
-                                         "/org/freedesktop/network-manager-applet/ce-page-bond.ui",
+                                         "/org/gnome/nm_connection_editor/ce-page-bond.ui",
                                          "BondPage",
                                          _("Bond")));
        if (!self) {
diff --git a/src/connection-editor/page-bridge-port.c b/src/connection-editor/page-bridge-port.c
index 00ee9fb..a7ed649 100644
--- a/src/connection-editor/page-bridge-port.c
+++ b/src/connection-editor/page-bridge-port.c
@@ -100,7 +100,7 @@ ce_page_bridge_port_new (NMConnectionEditor *editor,
                                                 connection,
                                                 parent_window,
                                                 client,
-                                                
"/org/freedesktop/network-manager-applet/ce-page-bridge-port.ui",
+                                                "/org/gnome/nm_connection_editor/ce-page-bridge-port.ui",
                                                 "BridgePortPage",
                                                 /* Translators: a "Bridge Port" is a network
                                                  * device that is part of a bridge.
diff --git a/src/connection-editor/page-bridge.c b/src/connection-editor/page-bridge.c
index 2213114..1f45263 100644
--- a/src/connection-editor/page-bridge.c
+++ b/src/connection-editor/page-bridge.c
@@ -228,7 +228,7 @@ ce_page_bridge_new (NMConnectionEditor *editor,
                                          connection,
                                          parent_window,
                                          client,
-                                         "/org/freedesktop/network-manager-applet/ce-page-bridge.ui",
+                                         "/org/gnome/nm_connection_editor/ce-page-bridge.ui",
                                          "BridgePage",
                                          _("Bridge")));
        if (!self) {
diff --git a/src/connection-editor/page-dcb.c b/src/connection-editor/page-dcb.c
index 74b6b43..e0e26bd 100644
--- a/src/connection-editor/page-dcb.c
+++ b/src/connection-editor/page-dcb.c
@@ -622,7 +622,7 @@ ce_page_dcb_new (NMConnectionEditor *editor,
                                         connection,
                                         parent_window,
                                         client,
-                                        "/org/freedesktop/network-manager-applet/ce-page-dcb.ui",
+                                        "/org/gnome/nm_connection_editor/ce-page-dcb.ui",
                                         "DcbPage",
                                         _("DCB")));
        if (!self) {
diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
index de1ad82..b07a1b5 100644
--- a/src/connection-editor/page-dsl.c
+++ b/src/connection-editor/page-dsl.c
@@ -215,7 +215,7 @@ ce_page_dsl_new (NMConnectionEditor *editor,
                                         connection,
                                         parent_window,
                                         client,
-                                        "/org/freedesktop/network-manager-applet/ce-page-dsl.ui",
+                                        "/org/gnome/nm_connection_editor/ce-page-dsl.ui",
                                         "DslPage",
                                         _("DSL/PPPoE")));
        if (!self) {
diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c
index f41b278..aea7d12 100644
--- a/src/connection-editor/page-ethernet.c
+++ b/src/connection-editor/page-ethernet.c
@@ -346,7 +346,7 @@ ce_page_ethernet_new (NMConnectionEditor *editor,
                                              connection,
                                              parent_window,
                                              client,
-                                             "/org/freedesktop/network-manager-applet/ce-page-ethernet.ui",
+                                             "/org/gnome/nm_connection_editor/ce-page-ethernet.ui",
                                              "EthernetPage",
                                              _("Ethernet")));
        if (!self) {
diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c
index 665f116..4641e61 100644
--- a/src/connection-editor/page-general.c
+++ b/src/connection-editor/page-general.c
@@ -368,7 +368,7 @@ ce_page_general_new (NMConnectionEditor *editor,
                                             connection,
                                             parent_window,
                                             client,
-                                            "/org/freedesktop/network-manager-applet/ce-page-general.ui",
+                                            "/org/gnome/nm_connection_editor/ce-page-general.ui",
                                             "GeneralPage",
                                             _("General")));
        if (!self) {
diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c
index 6139447..fb9a069 100644
--- a/src/connection-editor/page-infiniband.c
+++ b/src/connection-editor/page-infiniband.c
@@ -143,7 +143,7 @@ ce_page_infiniband_new (NMConnectionEditor *editor,
                                                connection,
                                                parent_window,
                                                client,
-                                               
"/org/freedesktop/network-manager-applet/ce-page-infiniband.ui",
+                                               "/org/gnome/nm_connection_editor/ce-page-infiniband.ui",
                                                "InfinibandPage",
                                                _("InfiniBand")));
        if (!self) {
diff --git a/src/connection-editor/page-ip-tunnel.c b/src/connection-editor/page-ip-tunnel.c
index af479fc..0a1ec02 100644
--- a/src/connection-editor/page-ip-tunnel.c
+++ b/src/connection-editor/page-ip-tunnel.c
@@ -171,7 +171,7 @@ ce_page_ip_tunnel_new (NMConnectionEditor *editor,
                                               connection,
                                               parent_window,
                                               client,
-                                              "/org/freedesktop/network-manager-applet/ce-page-ip-tunnel.ui",
+                                              "/org/gnome/nm_connection_editor/ce-page-ip-tunnel.ui",
                                               "IPTunnelPage",
                                               _("IP tunnel")));
        if (!self) {
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index dd42bd7..fa807df 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -1220,7 +1220,7 @@ ce_page_ip4_new (NMConnectionEditor *editor,
                                         connection,
                                         parent_window,
                                         client,
-                                        "/org/freedesktop/network-manager-applet/ce-page-ip4.ui",
+                                        "/org/gnome/nm_connection_editor/ce-page-ip4.ui",
                                         "IP4Page",
                                         _("IPv4 Settings")));
        if (!self) {
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index 1f45200..4fce0d9 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -1202,7 +1202,7 @@ ce_page_ip6_new (NMConnectionEditor *editor,
                                         connection,
                                         parent_window,
                                         client,
-                                        "/org/freedesktop/network-manager-applet/ce-page-ip6.ui",
+                                        "/org/gnome/nm_connection_editor/ce-page-ip6.ui",
                                         "IP6Page",
                                         _("IPv6 Settings")));
        if (!self) {
diff --git a/src/connection-editor/page-macsec.c b/src/connection-editor/page-macsec.c
index 43bfc43..a25cbe9 100644
--- a/src/connection-editor/page-macsec.c
+++ b/src/connection-editor/page-macsec.c
@@ -185,7 +185,7 @@ ce_page_macsec_new (NMConnectionEditor *editor,
                                            connection,
                                            parent_window,
                                            client,
-                                           "/org/freedesktop/network-manager-applet/ce-page-macsec.ui",
+                                           "/org/gnome/nm_connection_editor/ce-page-macsec.ui",
                                            "MacsecPage",
                                           _("MACsec")));
        if (!self) {
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index a9d0a92..62cdfa5 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -303,7 +303,7 @@ ce_page_mobile_new (NMConnectionEditor *editor,
                                            connection,
                                            parent_window,
                                            client,
-                                           "/org/freedesktop/network-manager-applet/ce-page-mobile.ui",
+                                           "/org/gnome/nm_connection_editor/ce-page-mobile.ui",
                                            "MobilePage",
                                            _("Mobile Broadband")));
        if (!self) {
diff --git a/src/connection-editor/page-ppp.c b/src/connection-editor/page-ppp.c
index de01bf2..3bd84a4 100644
--- a/src/connection-editor/page-ppp.c
+++ b/src/connection-editor/page-ppp.c
@@ -274,7 +274,7 @@ ce_page_ppp_new (NMConnectionEditor *editor,
                                         connection,
                                         parent_window,
                                         client,
-                                        "/org/freedesktop/network-manager-applet/ce-page-ppp.ui",
+                                        "/org/gnome/nm_connection_editor/ce-page-ppp.ui",
                                         "PppPage",
                                         _("PPP Settings")));
        if (!self) {
diff --git a/src/connection-editor/page-proxy.c b/src/connection-editor/page-proxy.c
index 1c2feba..36ff590 100644
--- a/src/connection-editor/page-proxy.c
+++ b/src/connection-editor/page-proxy.c
@@ -210,7 +210,7 @@ ce_page_proxy_new (NMConnectionEditor *editor,
                                           connection,
                                           parent_window,
                                           client,
-                                          "/org/freedesktop/network-manager-applet/ce-page-proxy.ui",
+                                          "/org/gnome/nm_connection_editor/ce-page-proxy.ui",
                                           "ProxyPage",
                                           _("Proxy")));
        if (!self) {
diff --git a/src/connection-editor/page-team-port.c b/src/connection-editor/page-team-port.c
index 1a1f8e9..c896551 100644
--- a/src/connection-editor/page-team-port.c
+++ b/src/connection-editor/page-team-port.c
@@ -647,7 +647,7 @@ ce_page_team_port_new (NMConnectionEditor *editor,
                                               connection,
                                               parent_window,
                                               client,
-                                              "/org/freedesktop/network-manager-applet/ce-page-team-port.ui",
+                                              "/org/gnome/nm_connection_editor/ce-page-team-port.ui",
                                               "TeamPortPage",
                                               /* Translators: a "Team Port" is a network
                                                * device that is part of a team.
diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c
index 062f46a..f4d0782 100644
--- a/src/connection-editor/page-team.c
+++ b/src/connection-editor/page-team.c
@@ -1026,7 +1026,7 @@ ce_page_team_new (NMConnectionEditor *editor,
                                          connection,
                                          parent_window,
                                          client,
-                                         "/org/freedesktop/network-manager-applet/ce-page-team.ui",
+                                         "/org/gnome/nm_connection_editor/ce-page-team.ui",
                                          "TeamPage",
                                          _("Team")));
        if (!self) {
diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c
index f5d4c8d..4d94f13 100644
--- a/src/connection-editor/page-vlan.c
+++ b/src/connection-editor/page-vlan.c
@@ -589,7 +589,7 @@ ce_page_vlan_new (NMConnectionEditor *editor,
                                          connection,
                                          parent_window,
                                          client,
-                                         "/org/freedesktop/network-manager-applet/ce-page-vlan.ui",
+                                         "/org/gnome/nm_connection_editor/ce-page-vlan.ui",
                                          "VlanPage",
                                          _("VLAN")));
        if (!self) {
diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c
index b34f427..20a1464 100644
--- a/src/connection-editor/page-wifi-security.c
+++ b/src/connection-editor/page-wifi-security.c
@@ -469,7 +469,7 @@ ce_page_wifi_security_new (NMConnectionEditor *editor,
                                                   connection,
                                                   parent_window,
                                                   client,
-                                                  
"/org/freedesktop/network-manager-applet/ce-page-wifi-security.ui",
+                                                  "/org/gnome/nm_connection_editor/ce-page-wifi-security.ui",
                                                   "WifiSecurityPage",
                                                   _("Wi-Fi Security")));
        if (!self) {
diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
index c6948a5..d11ff5b 100644
--- a/src/connection-editor/page-wifi.c
+++ b/src/connection-editor/page-wifi.c
@@ -435,7 +435,7 @@ ce_page_wifi_new (NMConnectionEditor *editor,
                                          connection,
                                          parent_window,
                                          client,
-                                         "/org/freedesktop/network-manager-applet/ce-page-wifi.ui",
+                                         "/org/gnome/nm_connection_editor/ce-page-wifi.ui",
                                          "WifiPage",
                                          _("Wi-Fi")));
        if (!self) {
diff --git a/src/connection-editor/ppp-auth-methods-dialog.c b/src/connection-editor/ppp-auth-methods-dialog.c
index 346c31e..40642e6 100644
--- a/src/connection-editor/ppp-auth-methods-dialog.c
+++ b/src/connection-editor/ppp-auth-methods-dialog.c
@@ -86,7 +86,7 @@ ppp_auth_methods_dialog_new (gboolean refuse_eap,
 
        builder = gtk_builder_new ();
 
-       if (!gtk_builder_add_from_resource (builder, 
"/org/freedesktop/network-manager-applet/ce-ppp-auth-methods.ui", &error)) {
+       if (!gtk_builder_add_from_resource (builder, 
"/org/gnome/nm_connection_editor/ce-ppp-auth-methods.ui", &error)) {
                g_warning ("Couldn't load builder resource: %s", error->message);
                g_error_free (error);
                return NULL;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]