Hello community,
here is the log from the commit of package NetworkManager-gnome
checked in at Fri Nov 7 16:03:30 CET 2008.
--------
--- GNOME/NetworkManager-gnome/NetworkManager-gnome.changes 2008-10-24 12:31:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-gnome/NetworkManager-gnome.changes 2008-11-03 14:03:33.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Nov 3 14:56:06 EET 2008 - tambet@suse.de
+
+- Use the accessors provided by NM instead of poking the private
+ structures directly for settings. (a.k.a make it built with the
+ latest NetworkManager again.)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
nm-applet-0.7.0.r965.tar.bz2
nm-applet-r965-use-modem-manager.patch
New:
----
nm-applet-0.7.0.r1012.tar.bz2
nm-applet-r1012-use-modem-manager.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-gnome.spec ++++++
--- /var/tmp/diff_new_pack.P30124/_old 2008-11-07 16:03:16.000000000 +0100
+++ /var/tmp/diff_new_pack.P30124/_new 2008-11-07 16:03:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package NetworkManager-gnome (Version 0.7.0.r965)
+# spec file for package NetworkManager-gnome (Version 0.7.0.r1012)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: NetworkManager-gnome
Url: http://www.gnome.org/projects/NetworkManager/
-Version: 0.7.0.r965
+Version: 0.7.0.r1012
Release: 1
License: GPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,9 +34,9 @@
%else
Patch1: nma-build-fix.patch
%endif
-Patch2: nm-applet-r965-use-modem-manager.patch
+Patch2: nm-applet-r1012-use-modem-manager.patch
Provides: NetworkManager-client
-Requires: NetworkManager >= 0.7.0.r4115
+Requires: NetworkManager >= 0.7.0.r4274
Requires: hal >= 0.5.0
%description
@@ -85,6 +85,10 @@
%{_datadir}/applications/nm-connection-editor.desktop
%changelog
+* Mon Nov 03 2008 tambet@suse.de
+- Use the accessors provided by NM instead of poking the private
+ structures directly for settings. (a.k.a make it built with the
+ latest NetworkManager again.)
* Fri Oct 24 2008 tambet@suse.de
- Updated connection editor UI.
- List certificates with '.cer' and '.crt' extensions too.
@@ -156,7 +160,7 @@
- Upgrade to the latest SVN.
* Mon Feb 04 2008 tambet@suse.de
- Update to the latest SVN.
-* Sat Jan 12 2008 maw@suse.de
+* Fri Jan 11 2008 maw@suse.de
- Remove unnecessary Requires
- Parallel build is broken, so don't build in parallel.
* Wed Nov 28 2007 tambet@suse.de
++++++ nm-applet-0.7.0.r965.tar.bz2 -> nm-applet-0.7.0.r1012.tar.bz2 ++++++
++++ 80678 lines of diff (skipped)
++++++ nm-applet-r965-use-modem-manager.patch -> nm-applet-r1012-use-modem-manager.patch ++++++
--- GNOME/NetworkManager-gnome/nm-applet-r965-use-modem-manager.patch 2008-10-24 12:31:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-gnome/nm-applet-r1012-use-modem-manager.patch 2008-11-07 14:52:39.000000000 +0100
@@ -31,7 +31,7 @@
nm_applet_LDADD = \
diff --git a/src/applet-device-gsm.c b/src/applet-device-gsm.c
-index 90c5e5e..e28d13c 100644
+index 7f9be72..bacd77b 100644
--- a/src/applet-device-gsm.c
+++ b/src/applet-device-gsm.c
@@ -24,6 +24,9 @@
@@ -53,7 +53,7 @@
#include "utils.h"
typedef struct {
-@@ -165,6 +170,50 @@ add_default_connection_item (NMDevice *device,
+@@ -174,6 +179,50 @@ add_default_connection_item (NMDevice *device,
}
static void
@@ -104,7 +104,7 @@
gsm_menu_item_deactivate (GtkMenuItem *item, gpointer user_data)
{
GSMMenuItemInfo *info = (GSMMenuItemInfo *) user_data;
-@@ -264,37 +313,68 @@ gsm_add_menu_item (NMDevice *device,
+@@ -273,40 +322,68 @@ gsm_add_menu_item (NMDevice *device,
add_connection_items (device, connections, active, menu, applet);
else
add_default_connection_item (device, menu, applet);
@@ -136,9 +136,12 @@
-
- connection = applet_find_active_connection_for_device (device, applet, NULL);
- if (connection) {
+- const char *id;
+-
- s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
-- if (s_con && s_con->id)
-- str = g_strdup_printf (_("You are now connected to '%s'."), s_con->id);
+- id = s_con ? nm_setting_connection_get_id (s_con) : NULL;
+- if (id)
+- str = g_strdup_printf (_("You are now connected to '%s'."), id);
- }
+ NMAGsmModem *modem;
+ char *oper_code;
@@ -189,7 +192,7 @@
}
static GdkPixbuf *
-@@ -304,6 +384,7 @@ gsm_get_icon (NMDevice *device,
+@@ -316,6 +393,7 @@ gsm_get_icon (NMDevice *device,
char **tip,
NMApplet *applet)
{
@@ -197,13 +200,17 @@
GdkPixbuf *pixbuf = NULL;
const char *iface;
NMSettingConnection *s_con = NULL;
-@@ -323,11 +404,40 @@ gsm_get_icon (NMDevice *device,
+@@ -335,15 +413,40 @@ gsm_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Waiting for user authentication on device '%s'..."), iface);
break;
case NM_DEVICE_STATE_ACTIVATED:
-- if (s_con && s_con->id)
-- *tip = g_strdup_printf (_("Mobile broadband connection '%s'"), s_con->id);
-- else
+- if (s_con) {
+- const char *id;
+-
+- id = nm_setting_connection_get_id (s_con);
+- if (id)
+- *tip = g_strdup_printf (_("Mobile broadband connection '%s'"), id);
+- } else
- *tip = g_strdup (_("Mobile broadband connection"));
- pixbuf = applet->wwan_icon;
+ modem = (NMAGsmModem *) g_object_get_data (G_OBJECT (device), "gsm-modem");
@@ -244,7 +251,7 @@
default:
break;
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
-index ee627f5..6fd29af 100644
+index 2522ff1..40f2d44 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -107,7 +107,6 @@ populate_gsm_ui (CEPageMobile *self, NMConnection *connection)
@@ -252,10 +259,10 @@
GHashTable *secrets;
GValue *value;
- GtkWidget *widget;
+ const char *s;
- if (setting->number)
- gtk_entry_set_text (priv->number, setting->number);
-@@ -141,17 +140,6 @@ populate_gsm_ui (CEPageMobile *self, NMConnection *connection)
+ s = nm_setting_gsm_get_number (setting);
+@@ -146,17 +145,6 @@ populate_gsm_ui (CEPageMobile *self, NMConnection *connection)
}
gtk_combo_box_set_active (priv->network_type, type_idx);
@@ -272,7 +279,7 @@
-
secrets = get_secrets (connection, nm_setting_get_name (priv->setting));
- if (setting->password)
+ s = nm_setting_gsm_get_password (setting);
diff --git a/src/mm-types.h b/src/mm-types.h
new file mode 100644
index 0000000..a1f9979
@@ -330,10 +337,10 @@
+EXTRA_DIST = $(glade_DATA)
diff --git a/src/modems/main.c b/src/modems/main.c
new file mode 100644
-index 0000000..fe531f0
+index 0000000..3243a6c
--- /dev/null
+++ b/src/modems/main.c
-@@ -0,0 +1,547 @@
+@@ -0,0 +1,559 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+#include