← Back to branch summary

~ubuntu-branches/ubuntu/wily/unity-control-center/wily

« back to all changes in this revision

Viewing changes to panels/network/network-dialogs.c

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Sebastien Bacher, Jian-Ding Chen (timchen119), Dan Winship
  • Date: 2015-02-03 12:26:36 UTC
  • mfrom: (1.1.32)
  • Revision ID: package-import@ubuntu.com-20150203122636-m94qu9ot7rgavwvw
Tags: 15.04.0+15.04.20150203.2-0ubuntu1
https://launchpad.net/bugs/1417034
[ Sebastien Bacher ]
* shell: don't use deprecated properties, avoid runtime warnings

[ Jian-Ding Chen (timchen119) ]
* Set higher priority of glxinfo's result then Xorg's log for
  "Details" -> "Overview" -> "Graphics" info in control center. (LP:
  #1417034) (LP: #1417034)

[ Dan Winship ]
* network: update for nma-wifi-dialog renaming

Show diffs side-by-side

added added

removed removed

Lines of Context:
panels/network/network-dialogs.c
30
30
#include <nm-device-wifi.h>
31
31
 
32
32
#include "network-dialogs.h"
33
 
#include "nm-wireless-dialog.h"
 
33
#include "nm-wifi-dialog.h"
34
34
#include "nm-mobile-wizard.h"
35
35
 
36
36
typedef struct {
108
108
                        gint response,
109
109
                        gpointer user_data)
110
110
{
111
 
        NMAWirelessDialog *wireless_dialog = NMA_WIRELESS_DIALOG (user_data);
 
111
        NMAWifiDialog *wireless_dialog = NMA_WIFI_DIALOG (user_data);
112
112
 
113
113
        if (response == GTK_RESPONSE_NO) {  /* user opted not to correct the warning */
114
 
                nma_wireless_dialog_set_nag_ignored (wireless_dialog, TRUE);
 
114
                nma_wifi_dialog_set_nag_ignored (wireless_dialog, TRUE);
115
115
                gtk_dialog_response (GTK_DIALOG (wireless_dialog), GTK_RESPONSE_OK);
116
116
        }
117
117
}
121
121
                             gint response,
122
122
                             gpointer user_data)
123
123
{
124
 
        NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (foo);
 
124
        NMAWifiDialog *dialog = NMA_WIFI_DIALOG (foo);
125
125
        WirelessDialogClosure *closure = user_data;
126
126
        NMConnection *connection, *fuzzy_match = NULL;
127
127
        NMDevice *device;
131
131
        if (response != GTK_RESPONSE_OK)
132
132
                goto done;
133
133
 
134
 
        if (!nma_wireless_dialog_get_nag_ignored (dialog)) {
 
134
        if (!nma_wifi_dialog_get_nag_ignored (dialog)) {
135
135
                GtkWidget *nag_dialog;
136
136
 
137
137
                /* Nag the user about certificates or whatever.  Only destroy the dialog
138
138
                 * if no nagging was done.
139
139
                 */
140
 
                nag_dialog = nma_wireless_dialog_nag_user (dialog);
 
140
                nag_dialog = nma_wifi_dialog_nag_user (dialog);
141
141
                if (nag_dialog) {
142
142
                        gtk_window_set_transient_for (GTK_WINDOW (nag_dialog), GTK_WINDOW (dialog));
143
143
                        g_signal_connect (nag_dialog, "response",
147
147
                }
148
148
        }
149
149
 
150
 
        /* nma_wireless_dialog_get_connection() returns a connection with the
 
150
        /* nma_wifi_dialog_get_connection() returns a connection with the
151
151
         * refcount incremented, so the caller must remember to unref it.
152
152
         */
153
 
        connection = nma_wireless_dialog_get_connection (dialog, &device, &ap);
 
153
        connection = nma_wifi_dialog_get_connection (dialog, &device, &ap);
154
154
        g_assert (connection);
155
155
        g_assert (device);
156
156
 
201
201
                                                       NULL);
202
202
        }
203
203
 
204
 
        /* Balance nma_wireless_dialog_get_connection() */
 
204
        /* Balance nma_wifi_dialog_get_connection() */
205
205
        g_object_unref (connection);
206
206
 
207
207
done:
245
245
{
246
246
  if (wifi_can_create_wifi_network (client)) {
247
247
          show_wireless_dialog (panel, client, settings,
248
 
                                nma_wireless_dialog_new_for_create (client, settings));
 
248
                                nma_wifi_dialog_new_for_create (client, settings));
249
249
  }
250
250
}
251
251
 
256
256
{
257
257
        g_debug ("connect to hidden wifi");
258
258
        show_wireless_dialog (panel, client, settings,
259
 
                              nma_wireless_dialog_new_for_other (client, settings));
 
259
                              nma_wifi_dialog_new_for_other (client, settings));
260
260
}
261
261
 
262
262
void
320
320
        g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, "mschapv2", NULL);
321
321
        nm_connection_add_setting (connection, NM_SETTING (s_8021x));
322
322
 
323
 
        dialog = nma_wireless_dialog_new (client, settings, connection, device, ap, FALSE);
 
323
        dialog = nma_wifi_dialog_new (client, settings, connection, device, ap, FALSE);
324
324
        show_wireless_dialog (panel, client, settings, dialog);
325
325
}
326
326