Merge lp:~seb128/unity-control-center/new-nm-build into lp:unity-control-center

Proposed by Sebastien Bacher on 2015-02-03
Status: Merged
Approved by: Iain Lane on 2015-02-03
Approved revision: no longer in the source branch.
Merged at revision: 12806
Proposed branch: lp:~seb128/unity-control-center/new-nm-build
Merge into: lp:unity-control-center
Diff against target: 111 lines (+13/-13)
2 files modified
debian/control (+1/-1)
panels/network/network-dialogs.c (+12/-12)
To merge this branch: bzr merge lp:~seb128/unity-control-center/new-nm-build
Reviewer Review Type Date Requested Status
Iain Lane 2015-02-03 Approve on 2015-02-03
Review via email: mp+248346@code.launchpad.net

Commit message

network: update for nma-wifi-dialog renaming

Description of the change

network: update for nma-wifi-dialog renaming

Backport from https://git.gnome.org/browse/gnome-control-center/commit/?id=fa31613bd9a0b2c314abfc04c4dfe2ed53ba614f

need to build on vivid with the new nm version

To post a comment you must log in.
Iain Lane (laney) :
review: Approve
Iain Lane (laney) wrote :

p.s. might want to bump the nm build-dep version

12804. By Dan Winship on 2015-02-03

network: update for nma-wifi-dialog renaming

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-01-26 15:53:12 +0000
3+++ debian/control 2015-02-03 12:17:50 +0000
4@@ -51,7 +51,7 @@
5 libxklavier-dev (>= 5.1),
6 libxml2-dev,
7 locales,
8- network-manager-dev (>= 0.9) [linux-any],
9+ network-manager-dev (>= 0.9.6.4) [linux-any],
10 shared-mime-info,
11 ttf-ubuntu-font-family,
12 libwebkitgtk-3.0-dev,
13
14=== modified file 'panels/network/network-dialogs.c'
15--- panels/network/network-dialogs.c 2012-10-02 06:57:38 +0000
16+++ panels/network/network-dialogs.c 2015-02-03 12:17:50 +0000
17@@ -30,7 +30,7 @@
18 #include <nm-device-wifi.h>
19
20 #include "network-dialogs.h"
21-#include "nm-wireless-dialog.h"
22+#include "nm-wifi-dialog.h"
23 #include "nm-mobile-wizard.h"
24
25 typedef struct {
26@@ -108,10 +108,10 @@
27 gint response,
28 gpointer user_data)
29 {
30- NMAWirelessDialog *wireless_dialog = NMA_WIRELESS_DIALOG (user_data);
31+ NMAWifiDialog *wireless_dialog = NMA_WIFI_DIALOG (user_data);
32
33 if (response == GTK_RESPONSE_NO) { /* user opted not to correct the warning */
34- nma_wireless_dialog_set_nag_ignored (wireless_dialog, TRUE);
35+ nma_wifi_dialog_set_nag_ignored (wireless_dialog, TRUE);
36 gtk_dialog_response (GTK_DIALOG (wireless_dialog), GTK_RESPONSE_OK);
37 }
38 }
39@@ -121,7 +121,7 @@
40 gint response,
41 gpointer user_data)
42 {
43- NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (foo);
44+ NMAWifiDialog *dialog = NMA_WIFI_DIALOG (foo);
45 WirelessDialogClosure *closure = user_data;
46 NMConnection *connection, *fuzzy_match = NULL;
47 NMDevice *device;
48@@ -131,13 +131,13 @@
49 if (response != GTK_RESPONSE_OK)
50 goto done;
51
52- if (!nma_wireless_dialog_get_nag_ignored (dialog)) {
53+ if (!nma_wifi_dialog_get_nag_ignored (dialog)) {
54 GtkWidget *nag_dialog;
55
56 /* Nag the user about certificates or whatever. Only destroy the dialog
57 * if no nagging was done.
58 */
59- nag_dialog = nma_wireless_dialog_nag_user (dialog);
60+ nag_dialog = nma_wifi_dialog_nag_user (dialog);
61 if (nag_dialog) {
62 gtk_window_set_transient_for (GTK_WINDOW (nag_dialog), GTK_WINDOW (dialog));
63 g_signal_connect (nag_dialog, "response",
64@@ -147,10 +147,10 @@
65 }
66 }
67
68- /* nma_wireless_dialog_get_connection() returns a connection with the
69+ /* nma_wifi_dialog_get_connection() returns a connection with the
70 * refcount incremented, so the caller must remember to unref it.
71 */
72- connection = nma_wireless_dialog_get_connection (dialog, &device, &ap);
73+ connection = nma_wifi_dialog_get_connection (dialog, &device, &ap);
74 g_assert (connection);
75 g_assert (device);
76
77@@ -201,7 +201,7 @@
78 NULL);
79 }
80
81- /* Balance nma_wireless_dialog_get_connection() */
82+ /* Balance nma_wifi_dialog_get_connection() */
83 g_object_unref (connection);
84
85 done:
86@@ -245,7 +245,7 @@
87 {
88 if (wifi_can_create_wifi_network (client)) {
89 show_wireless_dialog (panel, client, settings,
90- nma_wireless_dialog_new_for_create (client, settings));
91+ nma_wifi_dialog_new_for_create (client, settings));
92 }
93 }
94
95@@ -256,7 +256,7 @@
96 {
97 g_debug ("connect to hidden wifi");
98 show_wireless_dialog (panel, client, settings,
99- nma_wireless_dialog_new_for_other (client, settings));
100+ nma_wifi_dialog_new_for_other (client, settings));
101 }
102
103 void
104@@ -320,7 +320,7 @@
105 g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, "mschapv2", NULL);
106 nm_connection_add_setting (connection, NM_SETTING (s_8021x));
107
108- dialog = nma_wireless_dialog_new (client, settings, connection, device, ap, FALSE);
109+ dialog = nma_wifi_dialog_new (client, settings, connection, device, ap, FALSE);
110 show_wireless_dialog (panel, client, settings, dialog);
111 }
112

Subscribers

People subscribed via source and target branches