diff -Nru unity-control-center-15.04.0+15.04.20141217/debian/changelog unity-control-center-15.04.0+15.04.20150203.2/debian/changelog --- unity-control-center-15.04.0+15.04.20141217/debian/changelog 2015-02-03 14:06:19.000000000 +0000 +++ unity-control-center-15.04.0+15.04.20150203.2/debian/changelog 2015-02-03 14:06:19.000000000 +0000 @@ -1,3 +1,18 @@ +unity-control-center (15.04.0+15.04.20150203.2-0ubuntu1) vivid; urgency=medium + + [ 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 + + -- Ubuntu daily release Tue, 03 Feb 2015 12:26:36 +0000 + unity-control-center (15.04.0+15.04.20141217-0ubuntu2) vivid; urgency=medium * Switch gnome-icon-theme to adwaita-icon-theme, which is its diff -Nru unity-control-center-15.04.0+15.04.20141217/debian/control unity-control-center-15.04.0+15.04.20150203.2/debian/control --- unity-control-center-15.04.0+15.04.20141217/debian/control 2015-02-03 14:06:19.000000000 +0000 +++ unity-control-center-15.04.0+15.04.20150203.2/debian/control 2015-02-03 14:06:19.000000000 +0000 @@ -51,7 +51,7 @@ libxklavier-dev (>= 5.1), libxml2-dev, locales, - network-manager-dev (>= 0.9) [linux-any], + network-manager-dev (>= 0.9.6.4) [linux-any], shared-mime-info, ttf-ubuntu-font-family, libwebkitgtk-3.0-dev, diff -Nru unity-control-center-15.04.0+15.04.20141217/panels/info/cc-info-panel.c unity-control-center-15.04.0+15.04.20150203.2/panels/info/cc-info-panel.c --- unity-control-center-15.04.0+15.04.20141217/panels/info/cc-info-panel.c 2014-12-17 17:12:53.000000000 +0000 +++ unity-control-center-15.04.0+15.04.20150203.2/panels/info/cc-info-panel.c 2015-02-03 12:26:08.000000000 +0000 @@ -450,10 +450,10 @@ result->glx_renderer = get_graphics_data_glx_renderer (); result->xorg_vesa_hardware = get_graphics_data_xorg_vesa_hardware (); - if (result->xorg_vesa_hardware != NULL) - result->hardware_string = result->xorg_vesa_hardware; - else if (result->glx_renderer != NULL) + if (result->glx_renderer != NULL) result->hardware_string = result->glx_renderer; + else if (result->xorg_vesa_hardware != NULL) + result->hardware_string = result->xorg_vesa_hardware; else result->hardware_string = _("Unknown"); diff -Nru unity-control-center-15.04.0+15.04.20141217/panels/network/network-dialogs.c unity-control-center-15.04.0+15.04.20150203.2/panels/network/network-dialogs.c --- unity-control-center-15.04.0+15.04.20141217/panels/network/network-dialogs.c 2014-12-17 17:12:53.000000000 +0000 +++ unity-control-center-15.04.0+15.04.20150203.2/panels/network/network-dialogs.c 2015-02-03 12:26:25.000000000 +0000 @@ -30,7 +30,7 @@ #include #include "network-dialogs.h" -#include "nm-wireless-dialog.h" +#include "nm-wifi-dialog.h" #include "nm-mobile-wizard.h" typedef struct { @@ -108,10 +108,10 @@ gint response, gpointer user_data) { - NMAWirelessDialog *wireless_dialog = NMA_WIRELESS_DIALOG (user_data); + NMAWifiDialog *wireless_dialog = NMA_WIFI_DIALOG (user_data); if (response == GTK_RESPONSE_NO) { /* user opted not to correct the warning */ - nma_wireless_dialog_set_nag_ignored (wireless_dialog, TRUE); + nma_wifi_dialog_set_nag_ignored (wireless_dialog, TRUE); gtk_dialog_response (GTK_DIALOG (wireless_dialog), GTK_RESPONSE_OK); } } @@ -121,7 +121,7 @@ gint response, gpointer user_data) { - NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (foo); + NMAWifiDialog *dialog = NMA_WIFI_DIALOG (foo); WirelessDialogClosure *closure = user_data; NMConnection *connection, *fuzzy_match = NULL; NMDevice *device; @@ -131,13 +131,13 @@ if (response != GTK_RESPONSE_OK) goto done; - if (!nma_wireless_dialog_get_nag_ignored (dialog)) { + if (!nma_wifi_dialog_get_nag_ignored (dialog)) { GtkWidget *nag_dialog; /* Nag the user about certificates or whatever. Only destroy the dialog * if no nagging was done. */ - nag_dialog = nma_wireless_dialog_nag_user (dialog); + nag_dialog = nma_wifi_dialog_nag_user (dialog); if (nag_dialog) { gtk_window_set_transient_for (GTK_WINDOW (nag_dialog), GTK_WINDOW (dialog)); g_signal_connect (nag_dialog, "response", @@ -147,10 +147,10 @@ } } - /* nma_wireless_dialog_get_connection() returns a connection with the + /* nma_wifi_dialog_get_connection() returns a connection with the * refcount incremented, so the caller must remember to unref it. */ - connection = nma_wireless_dialog_get_connection (dialog, &device, &ap); + connection = nma_wifi_dialog_get_connection (dialog, &device, &ap); g_assert (connection); g_assert (device); @@ -201,7 +201,7 @@ NULL); } - /* Balance nma_wireless_dialog_get_connection() */ + /* Balance nma_wifi_dialog_get_connection() */ g_object_unref (connection); done: @@ -245,7 +245,7 @@ { if (wifi_can_create_wifi_network (client)) { show_wireless_dialog (panel, client, settings, - nma_wireless_dialog_new_for_create (client, settings)); + nma_wifi_dialog_new_for_create (client, settings)); } } @@ -256,7 +256,7 @@ { g_debug ("connect to hidden wifi"); show_wireless_dialog (panel, client, settings, - nma_wireless_dialog_new_for_other (client, settings)); + nma_wifi_dialog_new_for_other (client, settings)); } void @@ -320,7 +320,7 @@ g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, "mschapv2", NULL); nm_connection_add_setting (connection, NM_SETTING (s_8021x)); - dialog = nma_wireless_dialog_new (client, settings, connection, device, ap, FALSE); + dialog = nma_wifi_dialog_new (client, settings, connection, device, ap, FALSE); show_wireless_dialog (panel, client, settings, dialog); } diff -Nru unity-control-center-15.04.0+15.04.20141217/shell/shell.ui unity-control-center-15.04.0+15.04.20150203.2/shell/shell.ui --- unity-control-center-15.04.0+15.04.20141217/shell/shell.ui 2014-12-17 17:13:18.000000000 +0000 +++ unity-control-center-15.04.0+15.04.20150203.2/shell/shell.ui 2015-02-03 12:26:16.000000000 +0000 @@ -26,22 +26,21 @@ True - 5 - 5 - 10 - 5 True + 5 + 5 + 10 + 5 True - 1 - 0 True horizontal + GTK_ALIGN_END 210 @@ -94,7 +93,6 @@ True - queue none