[network-manager-applet/jk/applet-editor-libnm-port: 4/4] applet: GList -> GPtrArray



commit e9ef4a8f5f06f41b78aeb72ea7f7b94d8cefc058
Author: Jiří Klimeš <jklimes redhat com>
Date:   Mon Sep 29 18:52:16 2014 +0200

    applet: GList -> GPtrArray

 src/applet-dialogs.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
index c6d228e..28ae13a 100644
--- a/src/applet-dialogs.c
+++ b/src/applet-dialogs.c
@@ -482,7 +482,7 @@ info_dialog_add_page (GtkNotebook *notebook,
        NMSettingIP6Config *s_ip6;
        int row = 0;
        GtkWidget* speed_label, *sec_label = NULL;
-       const GSList *addresses;
+       GPtrArray *addresses;
        gboolean show_security = FALSE;
 
        grid = GTK_GRID (gtk_grid_new ());
@@ -631,8 +631,8 @@ info_dialog_add_page (GtkNotebook *notebook,
 
        ip4_config = nm_device_get_ip4_config (device);
        addresses = nm_ip4_config_get_addresses (ip4_config);
-       if (g_slist_length ((GSList *) addresses))
-               def_addr = addresses->data;
+       if (addresses && addresses->len > 0)
+               def_addr = (NMIP4Address *) g_ptr_array_index (addresses, 0);
 
        display_ip4_info (def_addr, grid, &row);
 
@@ -662,8 +662,8 @@ info_dialog_add_page (GtkNotebook *notebook,
        ip6_config = nm_device_get_ip6_config (device);
        if (ip6_config) {
                addresses = nm_ip6_config_get_addresses (ip6_config);
-               if (g_slist_length ((GSList *) addresses))
-                       def6_addr = addresses->data;
+               if (addresses && addresses->len > 0)
+                       def6_addr = (NMIP6Address *) g_ptr_array_index (addresses, 0);
        }
        display_ip6_info (def6_addr, method, grid, &row);
 
@@ -761,7 +761,7 @@ info_dialog_add_page_for_vpn (GtkNotebook *notebook,
        const char * const *dns6;
        NMIP4Address *def_addr = NULL;
        NMIP6Address *def6_addr = NULL;
-       const GSList *addresses;
+       GPtrArray *addresses;
        NMSettingIP6Config *s_ip6;
        const char *method = NULL;
        gboolean is_default = nm_active_connection_get_default (active);
@@ -819,8 +819,8 @@ info_dialog_add_page_for_vpn (GtkNotebook *notebook,
 
        ip4_config = nm_active_connection_get_ip4_config (active);
        addresses = nm_ip4_config_get_addresses (ip4_config);
-       if (g_slist_length ((GSList *) addresses))
-               def_addr = addresses->data;
+       if (addresses && addresses->len > 0)
+               def_addr = (NMIP4Address *) g_ptr_array_index (addresses, 0);
 
        display_ip4_info (def_addr, grid, &row);
 
@@ -850,8 +850,8 @@ info_dialog_add_page_for_vpn (GtkNotebook *notebook,
                }
 
                addresses = nm_ip6_config_get_addresses (ip6_config);
-               if (g_slist_length ((GSList *) addresses))
-                       def6_addr = addresses->data;
+               if (addresses && addresses->len > 0)
+                       def6_addr = (NMIP6Address *) g_ptr_array_index (addresses, 0);
 
                /* IPv6 Address */
                display_ip6_info (def6_addr, method, grid, &row);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]