r26703 - in /desktop/experimental/gnome-control-center/debian: ./ patches/
fpeters at users.alioth.debian.org
fpeters at users.alioth.debian.org
Fri Feb 25 10:00:27 UTC 2011
Author: fpeters
Date: Fri Feb 25 10:00:22 2011
New Revision: 26703
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26703
Log:
* New upstream release.
+ debian/patches/00_disable-nm.patch: disable Network Manager 0.9 bits.
+ debian/patches/10_mouse-panel-link.patch: fix linking of the mouse
panel.
+ debian/patches/11_keyboard-panel-link.patch: fix linking of the keyboard
panel.
+ debian/libgnome-control-center1.symbols: updated with a new symbol.
Added:
desktop/experimental/gnome-control-center/debian/patches/
desktop/experimental/gnome-control-center/debian/patches/00_disable-nm.patch
desktop/experimental/gnome-control-center/debian/patches/10_mouse-panel-link.patch
desktop/experimental/gnome-control-center/debian/patches/11_keyboard-panel-link.patch
desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch
desktop/experimental/gnome-control-center/debian/patches/series
Modified:
desktop/experimental/gnome-control-center/debian/changelog
desktop/experimental/gnome-control-center/debian/control
desktop/experimental/gnome-control-center/debian/control.in
desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols
Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=26703&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog [utf-8] Fri Feb 25 10:00:22 2011
@@ -1,3 +1,15 @@
+gnome-control-center (1:2.91.90-1) experimental; urgency=low
+
+ * New upstream release.
+ + debian/patches/00_disable-nm.patch: disable Network Manager 0.9 bits.
+ + debian/patches/10_mouse-panel-link.patch: fix linking of the mouse
+ panel.
+ + debian/patches/11_keyboard-panel-link.patch: fix linking of the keyboard
+ panel.
+ + debian/libgnome-control-center1.symbols: updated with a new symbol.
+
+ -- Frederic Peters <fpeters at debian.org> Fri, 25 Feb 2011 10:44:34 +0100
+
gnome-control-center (1:2.91.6-1) experimental; urgency=low
* debian/control.in:
Modified: desktop/experimental/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control?rev=26703&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control [utf-8] Fri Feb 25 10:00:22 2011
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Standards-Version: 3.9.1
Build-Depends: cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.10),
@@ -30,8 +30,8 @@
libxml2-dev,
gnome-settings-daemon-dev (>= 2.91.1),
libxft-dev (>= 2.1.2),
- libgnomekbd-dev (>= 2.91.2),
- libxklavier-dev (>= 4.0),
+ libgnomekbd-dev (>= 2.91.90),
+ libxklavier-dev (>= 5.1),
libupower-glib-dev (>= 0.9.1),
desktop-file-utils,
shared-mime-info,
Modified: desktop/experimental/gnome-control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control.in?rev=26703&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control.in [utf-8] Fri Feb 25 10:00:22 2011
@@ -25,8 +25,8 @@
libxml2-dev,
gnome-settings-daemon-dev (>= 2.91.1),
libxft-dev (>= 2.1.2),
- libgnomekbd-dev (>= 2.91.2),
- libxklavier-dev (>= 4.0),
+ libgnomekbd-dev (>= 2.91.90),
+ libxklavier-dev (>= 5.1),
libupower-glib-dev (>= 0.9.1),
desktop-file-utils,
shared-mime-info,
Modified: desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols?rev=26703&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols [utf-8] Fri Feb 25 10:00:22 2011
@@ -20,6 +20,7 @@
gconf_peditor_new_select_radio at Base 1:2.91.2
gconf_peditor_new_select_radio_with_enum at Base 1:2.91.2
gconf_peditor_new_string at Base 1:2.91.2
+ gconf_peditor_new_switch at Base 1:2.91.90
gconf_peditor_new_tree_view at Base 1:2.91.2
gconf_peditor_widget_set_guard at Base 1:2.91.2
gconf_property_editor_get_key at Base 1:2.91.2
Added: desktop/experimental/gnome-control-center/debian/patches/00_disable-nm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/00_disable-nm.patch?rev=26703&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/00_disable-nm.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/00_disable-nm.patch [utf-8] Fri Feb 25 10:00:22 2011
@@ -1,0 +1,1196 @@
+Description: disable NM 0.9 bits
+
+Index: gnome-control-center-2.91.90/configure.ac
+===================================================================
+--- gnome-control-center-2.91.90.orig/configure.ac 2011-02-25 09:56:16.856327001 +0100
++++ gnome-control-center-2.91.90/configure.ac 2011-02-25 09:56:22.900327002 +0100
+@@ -122,12 +122,7 @@
+ GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
+ AC_SUBST(GDESKTOP_PREFIX)
+
+-# Check for NetworkManager ~0.9
+-PKG_CHECK_MODULES(NETWORK_MANAGER, libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION,
+- [have_networkmanager=yes], have_networkmanager=no)
+-if test "x$have_networkmanager" = xno ; then
+- AC_MSG_WARN(*** Network panel will not be built (NetworkManager ~0.9 or newer not found) ***)
+-fi
++have_networkmanager=yes
+ AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
+
+ # Check for CUPS 1.4 or newer
+Index: gnome-control-center-2.91.90/panels/network/cc-network-panel.c
+===================================================================
+--- gnome-control-center-2.91.90.orig/panels/network/cc-network-panel.c 2011-02-25 09:56:16.848327001 +0100
++++ gnome-control-center-2.91.90/panels/network/cc-network-panel.c 2011-02-25 09:56:35.556327002 +0100
+@@ -24,16 +24,6 @@
+
+ #include "cc-network-panel.h"
+
+-#include "nm-remote-settings.h"
+-#include "nm-client.h"
+-#include "nm-device.h"
+-#include "nm-device-ethernet.h"
+-#include "nm-device-wifi.h"
+-#include "nm-utils.h"
+-#include "nm-active-connection.h"
+-#include "nm-vpn-connection.h"
+-#include "nm-setting-ip4-config.h"
+-
+ #include "panel-common.h"
+ #include "panel-cell-renderer-mode.h"
+ #include "panel-cell-renderer-signal.h"
+@@ -50,7 +40,6 @@
+ GPtrArray *devices;
+ GSettings *proxy_settings;
+ GtkBuilder *builder;
+- NMClient *client;
+ };
+
+ enum {
+@@ -72,8 +61,6 @@
+ PANEL_WIRELESS_COLUMN_LAST
+ };
+
+-static void nm_device_refresh_item_ui (CcNetworkPanel *panel, NMDevice *device);
+-
+ static void
+ cc_network_panel_get_property (GObject *object,
+ guint property_id,
+@@ -116,10 +103,6 @@
+ g_object_unref (priv->builder);
+ priv->builder = NULL;
+ }
+- if (priv->client != NULL) {
+- g_object_unref (priv->client);
+- priv->client = NULL;
+- }
+
+ G_OBJECT_CLASS (cc_network_panel_parent_class)->dispose (object);
+ }
+@@ -258,210 +241,6 @@
+ }
+
+ static void
+-panel_device_got_modem_manager_cb (GObject *source_object,
+- GAsyncResult *res,
+- gpointer user_data)
+-{
+- GError *error = NULL;
+- GVariant *result = NULL;
+- GDBusProxy *proxy;
+- NMDevice *device = (NMDevice *) user_data;
+-
+- proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
+- if (proxy == NULL) {
+- g_warning ("Error creating ModemManager proxy: %s",
+- error->message);
+- g_error_free (error);
+- goto out;
+- }
+-
+- /* get the IMEI */
+- result = g_dbus_proxy_get_cached_property (proxy,
+- "EquipmentIdentifier");
+-
+- /* save */
+- g_object_set_data_full (G_OBJECT (device),
+- "ControlCenter::EquipmentIdentifier",
+- g_variant_dup_string (result, NULL),
+- g_free);
+-out:
+- if (result != NULL)
+- g_variant_unref (result);
+- if (proxy != NULL)
+- g_object_unref (proxy);
+- return;
+-}
+-
+-static void
+-panel_get_registration_info_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
+-{
+- gchar *operator_code = NULL;
+- GError *error = NULL;
+- guint registration_status;
+- GVariant *result = NULL;
+- gchar *operator_name = NULL;
+- NMDevice *device = (NMDevice *) user_data;
+-
+- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error);
+- if (result == NULL) {
+- g_warning ("Error getting registration info: %s\n",
+- error->message);
+- g_error_free (error);
+- return;
+- }
+-
+- /* get values */
+- g_variant_get (result, "((uss))",
+- ®istration_status,
+- &operator_code,
+- &operator_name);
+-
+- /* save */
+- g_object_set_data_full (G_OBJECT (device),
+- "ControlCenter::OperatorName",
+- g_strdup (operator_name),
+- g_free);
+-
+- g_free (operator_name);
+- g_free (operator_code);
+- g_variant_unref (result);
+-}
+-
+-static void
+-panel_device_got_modem_manager_gsm_cb (GObject *source_object,
+- GAsyncResult *res,
+- gpointer user_data)
+-{
+- GError *error = NULL;
+- GDBusProxy *proxy;
+- NMDevice *device = (NMDevice *) user_data;
+-
+- proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
+- if (proxy == NULL) {
+- g_warning ("Error creating ModemManager GSM proxy: %s\n",
+- error->message);
+- g_error_free (error);
+- goto out;
+- }
+-
+- g_dbus_proxy_call (proxy,
+- "GetRegistrationInfo",
+- NULL,
+- G_DBUS_CALL_FLAGS_NONE,
+- -1,
+- NULL,
+- panel_get_registration_info_cb,
+- device);
+-out:
+- if (proxy != NULL)
+- g_object_unref (proxy);
+- return;
+-}
+-
+-static void
+-panel_add_device (CcNetworkPanel *panel, NMDevice *device)
+-{
+- GtkListStore *liststore_devices;
+- GtkTreeIter iter;
+- gchar *title = NULL;
+- NMDeviceType type;
+- CcNetworkPanelPrivate *priv = panel->priv;
+-
+- g_debug ("device %s type %i",
+- nm_device_get_udi (device),
+- nm_device_get_device_type (device));
+-
+- g_ptr_array_add (panel->priv->devices,
+- g_object_ref (device));
+-
+- /* do we have to get additonal data from ModemManager */
+- type = nm_device_get_device_type (device);
+- if (type == NM_DEVICE_TYPE_GSM ||
+- type == NM_DEVICE_TYPE_CDMA) {
+- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+- G_DBUS_PROXY_FLAGS_NONE,
+- NULL,
+- "org.freedesktop.ModemManager",
+- nm_device_get_udi (device),
+- "org.freedesktop.ModemManager.Modem",
+- panel->priv->cancellable,
+- panel_device_got_modem_manager_cb,
+- device);
+- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+- G_DBUS_PROXY_FLAGS_NONE,
+- NULL,
+- "org.freedesktop.ModemManager",
+- nm_device_get_udi (device),
+- "org.freedesktop.ModemManager.Modem.Gsm.Network",
+- panel->priv->cancellable,
+- panel_device_got_modem_manager_gsm_cb,
+- device);
+- }
+-
+- /* make title a bit bigger */
+- title = g_strdup_printf ("<span size=\"large\">%s</span>",
+- panel_device_type_to_localized_string (nm_device_get_device_type (device)));
+-
+- liststore_devices = GTK_LIST_STORE (gtk_builder_get_object (priv->builder,
+- "liststore_devices"));
+- gtk_list_store_append (liststore_devices, &iter);
+- gtk_list_store_set (liststore_devices,
+- &iter,
+- PANEL_DEVICES_COLUMN_ICON, panel_device_type_to_icon_name (nm_device_get_device_type (device)),
+- PANEL_DEVICES_COLUMN_SORT, panel_device_type_to_sortable_string (nm_device_get_device_type (device)),
+- PANEL_DEVICES_COLUMN_TITLE, title,
+- PANEL_DEVICES_COLUMN_ID, nm_device_get_udi (device),
+- PANEL_DEVICES_COLUMN_TOOLTIP, NULL,
+- PANEL_DEVICES_COLUMN_COMPOSITE_DEVICE, device,
+- -1);
+- g_free (title);
+-}
+-
+-static void
+-panel_remove_device (CcNetworkPanel *panel, NMDevice *device)
+-{
+- gboolean ret;
+- gchar *id_tmp;
+- GtkTreeIter iter;
+- GtkTreeModel *model;
+- guint i;
+- NMDevice *device_tmp = NULL;
+-
+- /* remove device from array */
+- for (i=0; i<panel->priv->devices->len; i++) {
+- device_tmp = g_ptr_array_index (panel->priv->devices, i);
+- if (g_strcmp0 (nm_device_get_udi (device),
+- nm_device_get_udi (device_tmp)) == 0) {
+- g_ptr_array_remove_index_fast (panel->priv->devices, i);
+- break;
+- }
+- }
+- if (device_tmp == NULL)
+- return;
+-
+- /* remove device from model */
+- model = GTK_TREE_MODEL (gtk_builder_get_object (panel->priv->builder,
+- "liststore_devices"));
+- ret = gtk_tree_model_get_iter_first (model, &iter);
+- if (!ret)
+- return;
+-
+- /* get the other elements */
+- do {
+- gtk_tree_model_get (model, &iter,
+- PANEL_DEVICES_COLUMN_ID, &id_tmp,
+- -1);
+- if (g_strcmp0 (id_tmp,
+- nm_device_get_udi (device_tmp)) == 0) {
+- gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+- g_free (id_tmp);
+- break;
+- }
+- g_free (id_tmp);
+- } while (gtk_tree_model_iter_next (model, &iter));
+-}
+-
+-static void
+ panel_add_devices_columns (CcNetworkPanel *panel, GtkTreeView *treeview)
+ {
+ CcNetworkPanelPrivate *priv = panel->priv;
+@@ -524,46 +303,6 @@
+ g_free (label_id);
+ }
+
+-static void
+-add_access_point (CcNetworkPanel *panel, NMAccessPoint *ap, NMAccessPoint *active)
+-{
+- CcNetworkPanelPrivate *priv = panel->priv;
+- const GByteArray *ssid;
+- const gchar *ssid_text;
+- const gchar *hw_address;
+- GtkListStore *liststore_wireless_network;
+- GtkTreeIter treeiter;
+- GtkWidget *widget;
+-
+- ssid = nm_access_point_get_ssid (ap);
+- if (ssid == NULL)
+- return;
+- ssid_text = nm_utils_escape_ssid (ssid->data, ssid->len);
+-
+- liststore_wireless_network = GTK_LIST_STORE (gtk_builder_get_object (priv->builder,
+- "liststore_wireless_network"));
+-
+- hw_address = nm_access_point_get_hw_address (ap);
+- gtk_list_store_append (liststore_wireless_network, &treeiter);
+- gtk_list_store_set (liststore_wireless_network,
+- &treeiter,
+- PANEL_WIRELESS_COLUMN_ID, hw_address,
+- PANEL_WIRELESS_COLUMN_TITLE, ssid_text,
+- PANEL_WIRELESS_COLUMN_SORT, ssid_text,
+- PANEL_WIRELESS_COLUMN_STRENGTH, nm_access_point_get_strength (ap),
+- PANEL_WIRELESS_COLUMN_MODE, nm_access_point_get_mode (ap),
+- -1);
+-
+- /* is this what we're on already? */
+- if (active == NULL)
+- return;
+- if (g_strcmp0 (hw_address, nm_access_point_get_hw_address (active)) == 0) {
+- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
+- "combobox_network_name"));
+- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (widget), &treeiter);
+- }
+-}
+-
+ static gchar *
+ ip4_address_as_string (guint32 ip)
+ {
+@@ -583,334 +322,12 @@
+ }
+
+ static void
+-panel_show_ip4_config (NMIP4Config *cfg)
+-{
+- gchar *tmp;
+- const GArray *array;
+- const GPtrArray *ptr_array;
+- GSList *iter;
+- int i;
+-
+- for (iter = (GSList *) nm_ip4_config_get_addresses (cfg); iter; iter = g_slist_next (iter)) {
+- NMIP4Address *addr = iter->data;
+- guint32 u;
+-
+- tmp = ip4_address_as_string (nm_ip4_address_get_address (addr));
+- g_debug ("IP4 address: %s", tmp);
+- g_free (tmp);
+-
+- u = nm_ip4_address_get_prefix (addr);
+- tmp = ip4_address_as_string (nm_utils_ip4_prefix_to_netmask (u));
+- g_debug ("IP4 prefix: %d (%s)", u, tmp);
+- g_free (tmp);
+-
+- tmp = ip4_address_as_string (nm_ip4_address_get_gateway (addr));
+- g_debug ("IP4 gateway: %s", tmp);
+- g_free (tmp);
+- }
+-
+- array = nm_ip4_config_get_nameservers (cfg);
+- if (array) {
+- g_debug ("IP4 DNS:");
+- for (i = 0; i < array->len; i++) {
+- tmp = ip4_address_as_string (g_array_index (array, guint32, i));
+- g_debug ("\t%s", tmp);
+- g_free (tmp);
+- }
+- }
+-
+- ptr_array = nm_ip4_config_get_domains (cfg);
+- if (ptr_array) {
+- g_debug ("IP4 domains:");
+- for (i = 0; i < ptr_array->len; i++)
+- g_debug ("\t%s", (const char *) g_ptr_array_index (ptr_array, i));
+- }
+-
+- array = nm_ip4_config_get_wins_servers (cfg);
+- if (array) {
+- g_debug ("IP4 WINS:");
+- for (i = 0; i < array->len; i++) {
+- tmp = ip4_address_as_string (g_array_index (array, guint32, i));
+- g_debug ("\t%s", tmp);
+- g_free (tmp);
+- }
+- }
+-}
+-
+-static GPtrArray *
+-panel_get_strongest_unique_aps (const GPtrArray *aps)
+-{
+- const GByteArray *ssid;
+- const GByteArray *ssid_tmp;
+- gboolean add_ap;
+- GPtrArray *aps_unique = NULL;
+- guint i;
+- guint j;
+- NMAccessPoint *ap;
+- NMAccessPoint *ap_tmp;
+-
+- /* we will have multiple entries for typical hotspots, just
+- * filter to the one with the strongest signal */
+- aps_unique = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
+- for (i = 0; i < aps->len; i++) {
+- ap = NM_ACCESS_POINT (g_ptr_array_index (aps, i));
+- ssid = nm_access_point_get_ssid (ap);
+- add_ap = TRUE;
+-
+- /* get already added list */
+- for (j=0; j<aps_unique->len; j++) {
+- ap_tmp = NM_ACCESS_POINT (g_ptr_array_index (aps, j));
+- ssid_tmp = nm_access_point_get_ssid (ap_tmp);
+-
+- /* is this the same type and data? */
+- if (ssid->len != ssid_tmp->len)
+- continue;
+- if (memcmp (ssid->data, ssid_tmp->data, ssid_tmp->len) != 0)
+- continue;
+- g_debug ("found duplicate: %s",
+- nm_utils_escape_ssid (ssid_tmp->data,
+- ssid_tmp->len));
+-
+- /* the new access point is stronger */
+- if (nm_access_point_get_strength (ap) >
+- nm_access_point_get_strength (ap_tmp)) {
+- g_debug ("removing %s",
+- nm_utils_escape_ssid (ssid_tmp->data,
+- ssid_tmp->len));
+- g_ptr_array_remove (aps_unique, ap_tmp);
+- break;
+- } else {
+- add_ap = FALSE;
+- break;
+- }
+- }
+- if (add_ap) {
+- g_debug ("adding %s",
+- nm_utils_escape_ssid (ssid->data,
+- ssid->len));
+- g_ptr_array_add (aps_unique, g_object_ref (ap));
+- }
+- }
+- return aps_unique;
+-}
+-
+-static void
+-nm_device_refresh_item_ui (CcNetworkPanel *panel, NMDevice *device)
+-{
+- CcNetworkPanelPrivate *priv = panel->priv;
+- const gchar *str;
+- const gchar *sub_pane = NULL;
+- const GPtrArray *aps;
+- GPtrArray *aps_unique = NULL;
+- gchar *str_tmp;
+- GHashTable *options = NULL;
+- GtkListStore *liststore_wireless_network;
+- GtkWidget *widget;
+- guint i;
+- NMAccessPoint *ap;
+- NMAccessPoint *active_ap;
+- NMDeviceState state;
+- NMDeviceType type;
+- NMDHCP4Config *config_dhcp4 = NULL;
+- NMDHCP6Config *config_dhcp6 = NULL;
+-
+- /* we have a new device */
+- g_debug ("selected device is: %s", nm_device_get_udi (device));
+- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
+- "hbox_device_header"));
+- gtk_widget_set_visible (widget, TRUE);
+-
+- type = nm_device_get_device_type (device);
+- g_debug ("device %s type %i",
+- nm_device_get_udi (device),
+- type);
+-
+- /* set device icon */
+- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
+- "image_device"));
+- gtk_image_set_from_icon_name (GTK_IMAGE (widget),
+- panel_device_type_to_icon_name (type),
+- GTK_ICON_SIZE_DIALOG);
+-
+- /* set device kind */
+- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
+- "label_device"));
+- gtk_label_set_label (GTK_LABEL (widget),
+- panel_device_type_to_localized_string (type));
+-
+-
+- /* set device state */
+- state = nm_device_get_state (device);
+- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
+- "label_status"));
+- gtk_label_set_label (GTK_LABEL (widget),
+- panel_device_state_to_localized_string (state));
+-
+- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
+- "notebook_types"));
+- if (type == NM_DEVICE_TYPE_ETHERNET) {
+- gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 0);
+- sub_pane = "wired";
+- } else if (type == NM_DEVICE_TYPE_WIFI) {
+- gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 1);
+- sub_pane = "wireless";
+- } else if (type == NM_DEVICE_TYPE_GSM ||
+- type == NM_DEVICE_TYPE_CDMA) {
+- gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 4);
+- sub_pane = "mobilebb";
+- }
+- if (sub_pane == NULL)
+- goto out;
+-
+- /* FIXME? should we need to do something with this? */
+- if (state == NM_DEVICE_STATE_ACTIVATED)
+- panel_show_ip4_config (nm_device_get_ip4_config (device));
+-
+- if (type == NM_DEVICE_TYPE_ETHERNET) {
+-
+- /* speed */
+- str_tmp = g_strdup_printf ("%d Mb/sec",
+- nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (device)));
+- panel_set_widget_data (panel,
+- sub_pane,
+- "speed",
+- str_tmp);
+- g_free (str_tmp);
+-
+- /* device MAC */
+- str = nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (device));
+- panel_set_widget_data (panel,
+- sub_pane,
+- "mac",
+- str);
+-
+- } else if (type == NM_DEVICE_TYPE_WIFI) {
+-
+- /* speed */
+- str_tmp = g_strdup_printf ("%d Mb/s",
+- nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (device)));
+- panel_set_widget_data (panel,
+- sub_pane,
+- "speed",
+- str_tmp);
+- g_free (str_tmp);
+-
+- /* device MAC */
+- str = nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (device));
+- panel_set_widget_data (panel,
+- sub_pane,
+- "mac",
+- str);
+- /* security */
+- str = nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (device));
+- panel_set_widget_data (panel,
+- sub_pane,
+- "security",
+- NULL); /* FIXME */
+-
+- /* populate access point dropdown */
+- liststore_wireless_network = GTK_LIST_STORE (gtk_builder_get_object (priv->builder,
+- "liststore_wireless_network"));
+- gtk_list_store_clear (liststore_wireless_network);
+- active_ap = nm_device_wifi_get_active_access_point (NM_DEVICE_WIFI (device));
+- aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device));
+- if (aps == NULL)
+- return;
+- aps_unique = panel_get_strongest_unique_aps (aps);
+- for (i = 0; i < aps_unique->len; i++) {
+- ap = NM_ACCESS_POINT (g_ptr_array_index (aps_unique, i));
+- add_access_point (panel,
+- ap,
+- active_ap);
+- }
+-
+- } else if (type == NM_DEVICE_TYPE_GSM ||
+- type == NM_DEVICE_TYPE_CDMA) {
+-
+- /* IMEI */
+- str = g_object_get_data (G_OBJECT (device),
+- "ControlCenter::EquipmentIdentifier");
+- panel_set_widget_data (panel,
+- sub_pane,
+- "imei",
+- str);
+-
+- /* operator name */
+- str = g_object_get_data (G_OBJECT (device),
+- "ControlCenter::OperatorName");
+- panel_set_widget_data (panel,
+- sub_pane,
+- "provider",
+- str);
+-
+- /* device speed */
+- panel_set_widget_data (panel,
+- sub_pane,
+- "speed",
+- NULL);
+- }
+-
+- /* get IP4 parameters */
+- config_dhcp4 = nm_device_get_dhcp4_config (device);
+- if (config_dhcp4 != NULL) {
+- g_object_get (G_OBJECT (config_dhcp4),
+- NM_DHCP4_CONFIG_OPTIONS, &options,
+- NULL);
+-
+- /* IPv4 address */
+- panel_set_widget_data (panel,
+- sub_pane,
+- "ip4",
+- nm_dhcp4_config_get_one_option (config_dhcp4,
+- "ip_address"));
+-
+- /* IPv4 DNS */
+- panel_set_widget_data (panel,
+- sub_pane,
+- "dns",
+- nm_dhcp4_config_get_one_option (config_dhcp4,
+- "domain_name_servers"));
+-
+- /* IPv4 route */
+- panel_set_widget_data (panel,
+- sub_pane,
+- "route",
+- nm_dhcp4_config_get_one_option (config_dhcp4,
+- "routers"));
+-
+- /* IPv4 netmask */
+- if (type == NM_DEVICE_TYPE_ETHERNET) {
+- panel_set_widget_data (panel,
+- sub_pane,
+- "subnet",
+- nm_dhcp4_config_get_one_option (config_dhcp4,
+- "subnet_mask"));
+- }
+- }
+-
+- /* get IP6 parameters */
+- if (0) config_dhcp6 = nm_device_get_dhcp6_config (device);
+- if (config_dhcp6 != NULL) {
+-
+- /* IPv6 address */
+- panel_set_widget_data (panel,
+- sub_pane,
+- "ip6",
+- nm_dhcp6_config_get_one_option (config_dhcp6,
+- "ip_address"));
+- }
+-out:
+- if (aps_unique != NULL)
+- g_ptr_array_unref (aps_unique);
+-}
+-
+-static void
+ nm_devices_treeview_clicked_cb (GtkTreeSelection *selection, CcNetworkPanel *panel)
+ {
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkWidget *widget;
+- NMDevice *device;
++ void *device;
+ CcNetworkPanelPrivate *priv = panel->priv;
+
+ /* will only work in single or browse selection mode! */
+@@ -939,12 +356,6 @@
+ goto out;
+ }
+
+- /* save so we can update */
+- g_free (priv->current_device);
+- priv->current_device = g_strdup (nm_device_get_udi (device));
+-
+- /* refresh device */
+- nm_device_refresh_item_ui (panel, device);
+ out:
+ return;
+ }
+@@ -975,175 +386,8 @@
+ }
+
+ static void
+-cc_network_panel_notify_enable_active_cb (GtkSwitch *sw,
+- GParamSpec *pspec,
+- CcNetworkPanel *panel)
+-{
+- gboolean enable;
+-
+- /* set enabled state */
+- enable = !gtk_switch_get_active (sw);
+- nm_client_wireless_set_enabled (panel->priv->client, enable);
+-}
+-
+-static void
+-active_connections_changed (NMClient *client, GParamSpec *pspec, gpointer user_data)
+-{
+- const GPtrArray *connections;
+- int i, j;
+-
+- g_debug ("Active connections changed:");
+- connections = nm_client_get_active_connections (client);
+- for (i = 0; connections && (i < connections->len); i++) {
+- NMActiveConnection *connection;
+- const GPtrArray *devices;
+-
+- connection = g_ptr_array_index (connections, i);
+- g_debug (" %s", nm_object_get_path (NM_OBJECT (connection)));
+- devices = nm_active_connection_get_devices (connection);
+- for (j = 0; devices && j < devices->len; j++)
+- g_debug (" %s", nm_device_get_udi (g_ptr_array_index (devices, j)));
+- if (NM_IS_VPN_CONNECTION (connection))
+- g_debug (" VPN base connection: %s", nm_active_connection_get_specific_object (connection));
+- }
+-}
+-
+-static void
+-device_state_notify_changed_cb (NMDevice *device,
+- GParamSpec *pspec,
+- gpointer user_data)
+-{
+- CcNetworkPanel *panel = CC_NETWORK_PANEL (user_data);
+-
+- /* only refresh the selected device */
+- if (g_strcmp0 (panel->priv->current_device,
+- nm_device_get_udi (device)) == 0) {
+- nm_device_refresh_item_ui (panel, device);
+- }
+-}
+-
+-static void
+-device_added_cb (NMClient *client, NMDevice *device, CcNetworkPanel *panel)
+-{
+- g_debug ("New device added");
+- panel_add_device (panel, device);
+- g_signal_connect (G_OBJECT (device), "notify::state",
+- (GCallback) device_state_notify_changed_cb, NULL);
+-}
+-
+-static void
+-device_removed_cb (NMClient *client, NMDevice *device, CcNetworkPanel *panel)
+-{
+- g_debug ("Device removed");
+- panel_remove_device (panel, device);
+-}
+-
+-static void
+-manager_running (NMClient *client, GParamSpec *pspec, gpointer user_data)
+-{
+- const GPtrArray *devices;
+- int i;
+- NMDevice *device_tmp;
+- CcNetworkPanel *panel = CC_NETWORK_PANEL (user_data);
+-
+- /* TODO: clear all devices we added */
+- if (!nm_client_get_manager_running (client)) {
+- g_debug ("NM disappeared");
+- return;
+- }
+-
+- g_debug ("coldplugging devices");
+- devices = nm_client_get_devices (client);
+- if (devices == NULL) {
+- g_debug ("No devices to add");
+- return;
+- }
+- for (i = 0; i < devices->len; i++) {
+- device_tmp = g_ptr_array_index (devices, i);
+- panel_add_device (panel, device_tmp);
+- }
+-
+- /* select the first device */
+- select_first_device (panel);
+-}
+-
+-static void
+-notify_connections_read_cb (NMRemoteSettings *settings,
+- GParamSpec *pspec,
+- gpointer user_data)
+-{
+- CcNetworkPanel *panel = CC_NETWORK_PANEL (user_data);
+- GSList *list, *iter;
+-
+- list = nm_remote_settings_list_connections (settings);
+- g_debug ("%p has %i remote connections",
+- panel, g_slist_length (list));
+- for (iter = list; iter; iter = g_slist_next (iter)) {
+- NMConnection *candidate = NM_CONNECTION (iter->data);
+- /* we can't actually test this yet as VPN support in
+- * NetworkManager 0.9 is currently broken */
+- g_debug ("TODO: add %s", nm_connection_get_path (candidate));
+- }
+-}
+-
+-static gboolean
+-panel_check_network_manager_version (CcNetworkPanel *panel)
+-{
+- const gchar *message;
+- const gchar *version;
+- gchar **split;
+- GtkWidget *dialog;
+- GtkWindow *window = NULL;
+- guint major = 0;
+- guint micro = 0;
+- guint minor = 0;
+- gboolean ret = TRUE;
+-
+- /* parse running version */
+- version = nm_client_get_version (panel->priv->client);
+- if (version != NULL) {
+- split = g_strsplit (version, ".", -1);
+- major = atoi (split[0]);
+- minor = atoi (split[1]);
+- micro = atoi (split[2]);
+- }
+-
+- /* is it too new */
+- if (major > 0 || major > 9) {
+-
+- /* TRANSLATORS: the user is running a NM that is too new and API compatible */
+- message = _("The running NetworkManager version is not compatible (too new).");
+-
+- /* is it new enough */
+- } else if (minor <= 8 && micro < 992) {
+-
+- /* TRANSLATORS: the user is running a NM that is too old and API compatible */
+- message = _("The running NetworkManager version is not compatible (too old).");
+- }
+-
+- /* nothing to do */
+- if (message == NULL)
+- goto out;
+-
+- /* do modal dialog */
+- ret = FALSE;
+- dialog = gtk_message_dialog_new (window,
+- GTK_DIALOG_MODAL,
+- GTK_MESSAGE_ERROR,
+- GTK_BUTTONS_CLOSE,
+- "%s",
+- message);
+- gtk_dialog_run (GTK_DIALOG (dialog));
+- gtk_widget_destroy (dialog);
+-out:
+- g_strfreev (split);
+- return ret;
+-}
+-
+-static void
+ cc_network_panel_init (CcNetworkPanel *panel)
+ {
+- DBusGConnection *bus = NULL;
+ gboolean ret;
+ GError *error = NULL;
+ gint value;
+@@ -1155,7 +399,6 @@
+ GtkTreeSelection *selection;
+ GtkTreeSortable *sortable;
+ GtkWidget *widget;
+- NMRemoteSettings *remote_settings;
+
+ panel->priv = NETWORK_PANEL_PRIVATE (panel);
+
+@@ -1270,44 +513,6 @@
+ /* add the virtual proxy device */
+ panel_add_proxy_device (panel);
+
+- /* setup wireless combobox model */
+- combobox = GTK_COMBO_BOX (gtk_builder_get_object (panel->priv->builder,
+- "combobox_network_name"));
+-
+- renderer = panel_cell_renderer_mode_new ();
+- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox),
+- renderer,
+- FALSE);
+- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
+- "mode", PANEL_WIRELESS_COLUMN_MODE,
+- NULL);
+-
+- /* sort networks in drop down */
+- sortable = GTK_TREE_SORTABLE (gtk_builder_get_object (panel->priv->builder,
+- "liststore_wireless_network"));
+- gtk_tree_sortable_set_sort_column_id (sortable,
+- PANEL_WIRELESS_COLUMN_SORT,
+- GTK_SORT_ASCENDING);
+-
+- renderer = panel_cell_renderer_signal_new ();
+- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox),
+- renderer,
+- FALSE);
+- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
+- "signal", PANEL_WIRELESS_COLUMN_STRENGTH,
+- NULL);
+-
+- /* use NetworkManager client */
+- panel->priv->client = nm_client_new ();
+- g_signal_connect (panel->priv->client, "notify::" NM_CLIENT_MANAGER_RUNNING,
+- G_CALLBACK (manager_running), panel);
+- g_signal_connect (panel->priv->client, "notify::" NM_CLIENT_ACTIVE_CONNECTIONS,
+- G_CALLBACK (active_connections_changed), panel);
+- g_signal_connect (panel->priv->client, "device-added",
+- G_CALLBACK (device_added_cb), panel);
+- g_signal_connect (panel->priv->client, "device-removed",
+- G_CALLBACK (device_removed_cb), panel);
+-
+ /* disable for now, until we can remove connections without
+ * segfaulting NM... */
+ widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
+@@ -1321,32 +526,10 @@
+ gtk_widget_set_sensitive (widget, FALSE);
+ widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
+ "switch_flight_mode"));
+- ret = nm_client_wireless_get_enabled (panel->priv->client);
+- gtk_switch_set_active (GTK_SWITCH (widget), !ret);
+- g_signal_connect (GTK_SWITCH (widget), "notify::active",
+- G_CALLBACK (cc_network_panel_notify_enable_active_cb),
+- panel);
++ gtk_switch_set_active (GTK_SWITCH (widget), FALSE);
+
+- /* add remote settings such as VPN settings as virtual devices */
+- bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
+- if (bus == NULL) {
+- g_warning ("Error connecting to system D-Bus: %s",
+- error->message);
+- g_error_free (error);
+- }
+- remote_settings = nm_remote_settings_new (bus);
+- g_signal_connect (remote_settings, "notify::" NM_REMOTE_SETTINGS_CONNECTIONS_READ,
+- G_CALLBACK (notify_connections_read_cb), panel);
+-
+- /* is the user compiling against a new version, but running an
+- * old daemon version? */
+- ret = panel_check_network_manager_version (panel);
+- if (ret) {
+- manager_running (panel->priv->client, NULL, panel);
+- } else {
+- /* just select the proxy settings */
+- select_first_device (panel);
+- }
++ /* just select the proxy settings */
++ select_first_device (panel);
+
+ /* hide implementation details */
+ widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
+Index: gnome-control-center-2.91.90/panels/network/panel-common.c
+===================================================================
+--- gnome-control-center-2.91.90.orig/panels/network/panel-common.c 2011-02-25 09:56:16.828327001 +0100
++++ gnome-control-center-2.91.90/panels/network/panel-common.c 2011-02-25 09:56:22.904327002 +0100
+@@ -27,188 +27,3 @@
+
+ #include "panel-common.h"
+
+-/**
+- * panel_device_type_to_icon_name:
+- **/
+-const gchar *
+-panel_device_type_to_icon_name (NMDeviceType type)
+-{
+- const gchar *value = NULL;
+- switch (type) {
+- case NM_DEVICE_TYPE_ETHERNET:
+- value = "network-wired";
+- break;
+- case NM_DEVICE_TYPE_WIFI:
+- case NM_DEVICE_TYPE_GSM:
+- case NM_DEVICE_TYPE_CDMA:
+- case NM_DEVICE_TYPE_BT:
+- case NM_DEVICE_TYPE_OLPC_MESH:
+- value = "network-wireless";
+- break;
+- default:
+- break;
+- }
+- return value;
+-}
+-
+-/**
+- * panel_device_type_to_localized_string:
+- **/
+-const gchar *
+-panel_device_type_to_localized_string (NMDeviceType type)
+-{
+- const gchar *value = NULL;
+- switch (type) {
+- case NM_DEVICE_TYPE_UNKNOWN:
+- /* TRANSLATORS: device type */
+- value = _("Unknown");
+- break;
+- case NM_DEVICE_TYPE_ETHERNET:
+- /* TRANSLATORS: device type */
+- value = _("Wired");
+- break;
+- case NM_DEVICE_TYPE_WIFI:
+- /* TRANSLATORS: device type */
+- value = _("Wireless");
+- break;
+- case NM_DEVICE_TYPE_GSM:
+- case NM_DEVICE_TYPE_CDMA:
+- /* TRANSLATORS: device type */
+- value = _("Mobile broadband");
+- break;
+- case NM_DEVICE_TYPE_BT:
+- /* TRANSLATORS: device type */
+- value = _("Bluetooth");
+- break;
+- case NM_DEVICE_TYPE_OLPC_MESH:
+- /* TRANSLATORS: device type */
+- value = _("Mesh");
+- break;
+- default:
+- break;
+- }
+- return value;
+-}
+-
+-/**
+- * panel_device_type_to_sortable_string:
+- *
+- * Try to return order of approximate connection speed.
+- **/
+-const gchar *
+-panel_device_type_to_sortable_string (NMDeviceType type)
+-{
+- const gchar *value = NULL;
+- switch (type) {
+- case NM_DEVICE_TYPE_ETHERNET:
+- value = "1";
+- break;
+- case NM_DEVICE_TYPE_WIFI:
+- value = "2";
+- break;
+- case NM_DEVICE_TYPE_GSM:
+- case NM_DEVICE_TYPE_CDMA:
+- value = "3";
+- break;
+- case NM_DEVICE_TYPE_BT:
+- value = "4";
+- break;
+- case NM_DEVICE_TYPE_OLPC_MESH:
+- value = "5";
+- break;
+- default:
+- value = "6";
+- break;
+- }
+- return value;
+-}
+-
+-/**
+- * panel_ap_mode_to_localized_string:
+- **/
+-const gchar *
+-panel_ap_mode_to_localized_string (NM80211Mode mode)
+-{
+- const gchar *value = NULL;
+- switch (mode) {
+- case NM_802_11_MODE_UNKNOWN:
+- /* TRANSLATORS: AP type */
+- value = _("Unknown");
+- break;
+- case NM_802_11_MODE_ADHOC:
+- /* TRANSLATORS: AP type */
+- value = _("Ad-hoc");
+- break;
+- case NM_802_11_MODE_INFRA:
+- /* TRANSLATORS: AP type */
+- value = _("Infrastructure");
+- break;
+- default:
+- break;
+- }
+- return value;
+-}
+-
+-/**
+- * panel_device_state_to_localized_string:
+- **/
+-const gchar *
+-panel_device_state_to_localized_string (NMDeviceState type)
+-{
+- const gchar *value = NULL;
+- switch (type) {
+- case NM_DEVICE_STATE_UNKNOWN:
+- /* TRANSLATORS: device status */
+- value = _("Status unknown");
+- break;
+- case NM_DEVICE_STATE_UNMANAGED:
+- /* TRANSLATORS: device status */
+- value = _("Unmanaged");
+- break;
+- case NM_DEVICE_STATE_UNAVAILABLE:
+- /* TRANSLATORS: device status */
+- value = _("Unavailable");
+- break;
+- case NM_DEVICE_STATE_DISCONNECTED:
+- /* TRANSLATORS: device status */
+- value = _("Disconnected");
+- break;
+- case NM_DEVICE_STATE_PREPARE:
+- /* TRANSLATORS: device status */
+- value = _("Preparing connection");
+- break;
+- case NM_DEVICE_STATE_CONFIG:
+- /* TRANSLATORS: device status */
+- value = _("Configuring connection");
+- break;
+- case NM_DEVICE_STATE_NEED_AUTH:
+- /* TRANSLATORS: device status */
+- value = _("Authenticating");
+- break;
+- case NM_DEVICE_STATE_IP_CONFIG:
+- /* TRANSLATORS: device status */
+- value = _("Getting network address");
+- break;
+- case NM_DEVICE_STATE_IP_CHECK:
+- /* TRANSLATORS: device status */
+- value = _("Checking network address");
+- break;
+- case NM_DEVICE_STATE_ACTIVATED:
+- /* TRANSLATORS: device status */
+- value = _("Connected");
+- break;
+- case NM_DEVICE_STATE_DEACTIVATING:
+- /* TRANSLATORS: device status */
+- value = _("Disconnecting");
+- break;
+- case NM_DEVICE_STATE_FAILED:
+- /* TRANSLATORS: device status */
+- value = _("Failed to connect");
+- break;
+- default:
+- /* TRANSLATORS: device status */
+- value = _("Status unknown (missing)");
+- break;
+- }
+- return value;
+-}
+Index: gnome-control-center-2.91.90/panels/network/panel-common.h
+===================================================================
+--- gnome-control-center-2.91.90.orig/panels/network/panel-common.h 2011-02-25 09:56:16.832327001 +0100
++++ gnome-control-center-2.91.90/panels/network/panel-common.h 2011-02-25 09:56:22.904327002 +0100
+@@ -23,16 +23,9 @@
+ #define PANEL_COMMON_H
+
+ #include <glib-object.h>
+-#include <NetworkManager.h>
+
+ G_BEGIN_DECLS
+
+-const gchar *panel_device_type_to_icon_name (NMDeviceType type);
+-const gchar *panel_device_type_to_localized_string (NMDeviceType type);
+-const gchar *panel_device_type_to_sortable_string (NMDeviceType type);
+-const gchar *panel_ap_mode_to_localized_string (NM80211Mode mode);
+-const gchar *panel_device_state_to_localized_string (NMDeviceState type);
+-
+ G_END_DECLS
+
+ #endif /* PANEL_COMMON_H */
+Index: gnome-control-center-2.91.90/panels/network/panel-cell-renderer-mode.c
+===================================================================
+--- gnome-control-center-2.91.90.orig/panels/network/panel-cell-renderer-mode.c 2011-02-25 09:56:16.820327001 +0100
++++ gnome-control-center-2.91.90/panels/network/panel-cell-renderer-mode.c 2011-02-25 09:56:22.904327002 +0100
+@@ -64,8 +64,6 @@
+ {
+ const gchar *icon_name = NULL;
+
+- if (renderer->mode == NM_802_11_MODE_ADHOC)
+- icon_name = "network-workgroup";
+
+ g_object_set (renderer, "icon-name", icon_name, NULL);
+ }
+Index: gnome-control-center-2.91.90/panels/network/panel-cell-renderer-mode.h
+===================================================================
+--- gnome-control-center-2.91.90.orig/panels/network/panel-cell-renderer-mode.h 2011-02-25 09:56:16.816327001 +0100
++++ gnome-control-center-2.91.90/panels/network/panel-cell-renderer-mode.h 2011-02-25 09:56:22.904327002 +0100
+@@ -25,9 +25,6 @@
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
+
+-#include "nm-device.h"
+-#include "nm-access-point.h"
+-
+ #define PANEL_TYPE_CELL_RENDERER_MODE (panel_cell_renderer_mode_get_type())
+ #define PANEL_CELL_RENDERER_MODE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PANEL_TYPE_CELL_RENDERER_MODE, PanelCellRendererMode))
+ #define PANEL_CELL_RENDERER_MODE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), PANEL_TYPE_CELL_RENDERER_MODE, PanelCellRendererModeClass))
+Index: gnome-control-center-2.91.90/panels/network/panel-cell-renderer-signal.h
+===================================================================
+--- gnome-control-center-2.91.90.orig/panels/network/panel-cell-renderer-signal.h 2011-02-25 09:56:16.808327001 +0100
++++ gnome-control-center-2.91.90/panels/network/panel-cell-renderer-signal.h 2011-02-25 09:56:22.904327002 +0100
+@@ -25,9 +25,6 @@
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
+
+-#include "nm-device.h"
+-#include "nm-access-point.h"
+-
+ #define PANEL_TYPE_CELL_RENDERER_SIGNAL (panel_cell_renderer_signal_get_type())
+ #define PANEL_CELL_RENDERER_SIGNAL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PANEL_TYPE_CELL_RENDERER_SIGNAL, PanelCellRendererSignal))
+ #define PANEL_CELL_RENDERER_SIGNAL_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), PANEL_TYPE_CELL_RENDERER_SIGNAL, PanelCellRendererSignalClass))
Added: desktop/experimental/gnome-control-center/debian/patches/10_mouse-panel-link.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/10_mouse-panel-link.patch?rev=26703&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/10_mouse-panel-link.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/10_mouse-panel-link.patch [utf-8] Fri Feb 25 10:00:22 2011
@@ -1,0 +1,15 @@
+Description: fix linking of mouse panel
+
+Index: gnome-control-center-2.91.90/panels/mouse/Makefile.am
+===================================================================
+--- gnome-control-center-2.91.90.orig/panels/mouse/Makefile.am 2011-02-24 23:31:54.992327001 +0100
++++ gnome-control-center-2.91.90/panels/mouse/Makefile.am 2011-02-25 09:18:00.136327002 +0100
+@@ -23,7 +23,7 @@
+ gsd-input-helper.c \
+ gsd-input-helper.h
+
+-libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS)
++libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS) -lX11
+ libmouse_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
+
+ @INTLTOOL_DESKTOP_RULE@
Added: desktop/experimental/gnome-control-center/debian/patches/11_keyboard-panel-link.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/11_keyboard-panel-link.patch?rev=26703&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/11_keyboard-panel-link.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/11_keyboard-panel-link.patch [utf-8] Fri Feb 25 10:00:22 2011
@@ -1,0 +1,15 @@
+Description: fix linking of keyboard panel
+
+Index: gnome-control-center-2.91.90/panels/keyboard/Makefile.am
+===================================================================
+--- gnome-control-center-2.91.90.orig/panels/keyboard/Makefile.am 2011-02-25 09:17:03.824327001 +0100
++++ gnome-control-center-2.91.90/panels/keyboard/Makefile.am 2011-02-25 09:17:37.900327001 +0100
+@@ -22,7 +22,7 @@
+ eggaccelerators.h
+
+ libkeyboard_la_CFLAGS = $(PANEL_CFLAGS) $(KEYBOARD_PANEL_CFLAGS)
+-libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS)
++libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS) -lX11
+ libkeyboard_la_LDFLAGS = $(PANEL_LDFLAGS)
+
+ @INTLTOOL_DESKTOP_RULE@
Added: desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch?rev=26703&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch [utf-8] Fri Feb 25 10:00:22 2011
@@ -1,0 +1,250 @@
+Index: gnome-control-center-2.91.90/configure
+===================================================================
+--- gnome-control-center-2.91.90.orig/configure 2011-02-24 23:31:54.968327001 +0100
++++ gnome-control-center-2.91.90/configure 2011-02-25 09:18:34.864327002 +0100
+@@ -791,8 +791,6 @@
+ CUPS_CONFIG
+ BUILD_NETWORK_FALSE
+ BUILD_NETWORK_TRUE
+-NETWORK_MANAGER_LIBS
+-NETWORK_MANAGER_CFLAGS
+ GDESKTOP_PREFIX
+ USER_ACCOUNTS_PANEL_LIBS
+ USER_ACCOUNTS_PANEL_CFLAGS
+@@ -1090,8 +1088,6 @@
+ UNIVERSAL_ACCESS_PANEL_LIBS
+ USER_ACCOUNTS_PANEL_CFLAGS
+ USER_ACCOUNTS_PANEL_LIBS
+-NETWORK_MANAGER_CFLAGS
+-NETWORK_MANAGER_LIBS
+ CHEESE_CFLAGS
+ CHEESE_LIBS
+ ISOCODES_CFLAGS
+@@ -1860,10 +1856,6 @@
+ C compiler flags for USER_ACCOUNTS_PANEL, overriding pkg-config
+ USER_ACCOUNTS_PANEL_LIBS
+ linker flags for USER_ACCOUNTS_PANEL, overriding pkg-config
+- NETWORK_MANAGER_CFLAGS
+- C compiler flags for NETWORK_MANAGER, overriding pkg-config
+- NETWORK_MANAGER_LIBS
+- linker flags for NETWORK_MANAGER, overriding pkg-config
+ CHEESE_CFLAGS
+ C compiler flags for CHEESE, overriding pkg-config
+ CHEESE_LIBS linker flags for CHEESE, overriding pkg-config
+@@ -5330,13 +5322,13 @@
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:5333: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5325: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:5336: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5328: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:5339: output\"" >&5)
++ (eval echo "\"\$as_me:5331: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -6541,7 +6533,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 6544 "configure"' > conftest.$ac_ext
++ echo '#line 6536 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -7820,11 +7812,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:7823: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7815: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:7827: \$? = $ac_status" >&5
++ echo "$as_me:7819: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8159,11 +8151,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8162: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8154: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8166: \$? = $ac_status" >&5
++ echo "$as_me:8158: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -8264,11 +8256,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8267: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8259: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8271: \$? = $ac_status" >&5
++ echo "$as_me:8263: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -8319,11 +8311,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8322: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8314: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8326: \$? = $ac_status" >&5
++ echo "$as_me:8318: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -10703,7 +10695,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 10706 "configure"
++#line 10698 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -10799,7 +10791,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 10802 "configure"
++#line 10794 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -16438,80 +16430,7 @@
+ GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
+
+
+-# Check for NetworkManager ~0.9
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5
+-$as_echo_n "checking for NETWORK_MANAGER... " >&6; }
+-
+-if test -n "$NETWORK_MANAGER_CFLAGS"; then
+- pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib >= \$NETWORK_MANAGER_REQUIRED_VERSION\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$NETWORK_MANAGER_LIBS"; then
+- pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-glib >= \$NETWORK_MANAGER_REQUIRED_VERSION\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION" 2>&1`
+- else
+- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$NETWORK_MANAGER_PKG_ERRORS" >&5
+-
+- have_networkmanager=no
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- have_networkmanager=no
+-else
+- NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
+- NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- have_networkmanager=yes
+-fi
+-if test "x$have_networkmanager" = xno ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Network panel will not be built (NetworkManager ~0.9 or newer not found) ***" >&5
+-$as_echo "$as_me: WARNING: *** Network panel will not be built (NetworkManager ~0.9 or newer not found) ***" >&2;}
+-fi
++have_networkmanager=yes
+ if test x$have_networkmanager = xyes; then
+ BUILD_NETWORK_TRUE=
+ BUILD_NETWORK_FALSE='#'
+Index: gnome-control-center-2.91.90/panels/mouse/Makefile.in
+===================================================================
+--- gnome-control-center-2.91.90.orig/panels/mouse/Makefile.in 2011-02-24 23:31:54.960327001 +0100
++++ gnome-control-center-2.91.90/panels/mouse/Makefile.in 2011-02-25 09:18:36.772327001 +0100
+@@ -226,8 +226,6 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+-NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+-NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NETWORK_PANEL_CFLAGS = @NETWORK_PANEL_CFLAGS@
+ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@
+ NM = @NM@
+@@ -364,7 +362,7 @@
+ gsd-input-helper.c \
+ gsd-input-helper.h
+
+-libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS)
++libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS) -lX11
+ libmouse_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
+ pixmapdir = $(pkgdatadir)/pixmaps
+ pixmap_DATA = \
+Index: gnome-control-center-2.91.90/panels/keyboard/Makefile.in
+===================================================================
+--- gnome-control-center-2.91.90.orig/panels/keyboard/Makefile.in 2011-02-25 09:18:20.192327002 +0100
++++ gnome-control-center-2.91.90/panels/keyboard/Makefile.in 2011-02-25 09:18:36.628327001 +0100
+@@ -370,7 +370,7 @@
+ eggaccelerators.h
+
+ libkeyboard_la_CFLAGS = $(PANEL_CFLAGS) $(KEYBOARD_PANEL_CFLAGS)
+-libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS)
++libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS) -lX11
+ libkeyboard_la_LDFLAGS = $(PANEL_LDFLAGS)
+ uidir = $(pkgdatadir)/ui
+ ui_DATA = gnome-keyboard-panel.ui
Added: desktop/experimental/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/series?rev=26703&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/series (added)
+++ desktop/experimental/gnome-control-center/debian/patches/series [utf-8] Fri Feb 25 10:00:22 2011
@@ -1,0 +1,4 @@
+00_disable-nm.patch
+10_mouse-panel-link.patch
+11_keyboard-panel-link.patch
+99_autoreconf.patch
More information about the pkg-gnome-commits
mailing list