--- network-manager-applet-0.7.1~rc3.orig/aclocal.m4
+++ network-manager-applet-0.7.1~rc3/aclocal.m4
@@ -0,0 +1 @@
+# empty file
--- network-manager-applet-0.7.1~rc3.orig/debian/network-manager-applet.manpages
+++ network-manager-applet-0.7.1~rc3/debian/network-manager-applet.manpages
@@ -0,0 +1 @@
+debian/nm-applet.1
--- network-manager-applet-0.7.1~rc3.orig/debian/nm-applet.sgml
+++ network-manager-applet-0.7.1~rc3/debian/nm-applet.sgml
@@ -0,0 +1,100 @@
+ manpage.1'. You may view
+ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+ less'. A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+
+
+ The docbook-to-man binary is found in the docbook-to-man package.
+ Please remember that if you create the nroff version in one of the
+ debian/rules file targets (such as build), you will need to include
+ docbook-to-man in your Build-Depends control field.
+
+ -->
+
+
+ 8 February, 2006">
+
+
+ GNU">
+ GPL">
+]>
+
+
+
+
+ giskard@autistici.org;
+
+
+ Riccardo
+ Setti
+
+
+ 2006
+ Riccardo Setti
+
+ &date;
+
+
+ nm-applet
+ 1
+
+
+ &package;
+
+ Network management framework
+
+
+
+ &package;
+
+
+
+ DESCRIPTION
+
+ &package; is the GNOME front-end for NetworkManager
+ It is a systray applet which will display an icon in GNOME's notification area but it
+ also works for other desktop environments which provide a systray like KDE or XFCE.
+ &package; shows a list of available networks and allows you to easily switch between them. For encrypted networks it
+ will prompt you for the key/passphrase and you can optionally store them in the gnome-keyring so you don't have to
+ type them again.
+
+
+ SEE ALSO
+
+ NetworkManager (1). nm-vpn-properties (1)
+
+ More Information about NetworkManager can be found at
+ http://www.gnome.org/projects/NetworkManager/ .
+
+
+ AUTHOR
+
+ This manual page was written by Riccardo Setti giskard@autistici.org for
+ the Debian system.
+
+
+
+
+
+
--- network-manager-applet-0.7.1~rc3.orig/debian/changelog
+++ network-manager-applet-0.7.1~rc3/debian/changelog
@@ -0,0 +1,409 @@
+network-manager-applet (0.7.1~rc3-0ubuntu1) jaunty; urgency=low
+
+ * new upstream RC 0.7.1rc3
+ + rev: 982
+ + revision-id: svn-v3-trunk0:9c6bbc85-7128-0410-879a-9bbc9e4270e9:branches%2FNETWORKMANAGER_APPLET_0_7:1212
+ + branch: http://bzr-playground.gnome.org/network-manager-applet/branches/NETWORKMANAGER_APPLET_0_7/
+ - update .bzr-builddeb/default.conf
+ * bump lower builds for network-manager build depends to >= 0.7.1~rc3
+ - update control
+ * fix LP: #328572 - Connecting/disconnecting notification changes; we apply the
+ the "Connecting" part of this patch, as the disconnecting part would require
+ string changes that need to be done upstream
+ - add patches/lp328572-dxteam-connect-text.patch
+ - update patches/series
+ * fix LP: #330571 - Wired connected message in nm-applet too long
+ - add patches/lp330571_dxteam_wired_connect_text.patch
+ - update patches/series
+ * fix LP: #330608 - GSM connection message too long in nm-applet
+ - add patches/lp330608_dxteam_gsm_connect_text.patch
+ - update patches/series
+ * fix LP: #337960 - nm-applet jaunty icon changes - brought to you by d(u)xteam;
+ we apply two patches: first patch changes the icon names referred to in notifications;
+ second patch ships fallback icons for those names within network-manager-gnome
+ package
+
+ -- Alexander Sack Thu, 05 Mar 2009 01:30:46 +0100
+
+network-manager-applet (0.7.1~rc1+20090219+bzr974-0ubuntu2) jaunty; urgency=low
+
+ * "Network Connections" settings entry does not appear in gnome-control-center;
+ we fix a typo in the .desktop file introduced by the xfce patch
+ - update patches/lp295788_xfce_menu_entry.patch
+
+ -- Alexander Sack Mon, 23 Feb 2009 15:45:07 +0100
+
+network-manager-applet (0.7.1~rc1+20090219+bzr974-0ubuntu1) jaunty; urgency=low
+
+ * new upstream snapshot 0.7.1rc1+ Feb 19, 2009
+ + rev: 974
+ + revision-id: svn-v3-trunk0:9c6bbc85-7128-0410-879a-9bbc9e4270e9:branches%2FNETWORKMANAGER_APPLET_0_7:1186
+ + branch: http://bzr-playground.gnome.org/network-manager-applet/branches/NETWORKMANAGER_APPLET_0_7/
+ - update .bzr-builddeb/default.conf
+ * rebase diverged patches
+ - update patches/add_libmbca_support.patch
+ * fix LP: #331799 - nm-applet must not send actions when notification server
+ does not support actions
+ - add patches/331799_sensible_notify_actions.patch
+ - update patches/series
+
+ -- Alexander Sack Thu, 19 Feb 2009 23:32:28 +0100
+
+network-manager-applet (0.7.1~20090213+bzr960-0ubuntu1) jaunty; urgency=low
+
+ * new upstream snapshot 0.7.1pre Feb 13, 2009
+ + rev: 960
+ + revision-id: svn-v3-trunk0:9c6bbc85-7128-0410-879a-9bbc9e4270e9:branches%2FNETWORKMANAGER_APPLET_0_7:1161
+ + branch: http://bzr-playground.gnome.org/network-manager-applet/branches/NETWORKMANAGER_APPLET_0_7/
+ * add config for bzr-builddeb meta information; we declare "merge" as default
+ operation mode and set the current top most upstream revision id
+ - add .bzr-builddeb/default.conf
+ * adjust patches to new upstream code
+ - update patches/add_libmbca_support.patch
+ * new tree layout doesn't have upstream sources; in turn we apply
+ autotools/cdbs integration magic on the fly now; this means we run
+ intltoolize in pre-build and create a dummy aclocal.m4 in clean::;
+ doing that allows us to use a bzr export from the upstream tree
+ instead of a make dist tarball
+ - update rules
+ * fix "(applet.c:1044):applet_open_mbca: code should not be reached"
+ warnings that get dumped to console; typos produced those warnings
+ even if nothing was wrong
+ - update patches/add_libmbca_support.patch
+ * bump lower bound for network-manager build-depends to >= 0.7.1~
+ - update control
+ * fix LP: #327427 - network manager applet should pop up wizard when
+ 3g device is plugged in and no configuration exists; we adjust the
+ mobile broadband patch to not show notification.
+ - update patches/add_libmbca_support.patch
+
+ -- Alexander Sack Tue, 17 Feb 2009 16:06:09 +0100
+
+network-manager-applet (0.7-0ubuntu2) jaunty; urgency=low
+
+ * fix LP: #295788 - Network Configuration menu item should also be
+ displayed in Xfce; we add XFCE to the OnlyShowIn .desktop field;
+ patch by Martin Mai
+ - add debian/patches/lp295788_xfce_menu_entry.patch
+ * fix LP: #327411 - network-manager: configure button(s) to create gsm
+ connections only works on first attempt; the assitants lists contains
+ UdiAssitants and not MbcaAssistant's
+ - update debian/patches/add_libmbca_support.patch
+
+ -- Alexander Sack Sun, 15 Feb 2009 02:29:53 +0100
+
+network-manager-applet (0.7-0ubuntu1) jaunty; urgency=low
+
+ * merge new upstrema release (0.7) from trunk branch (rev970)
+ * drop patches superseeded/applied upstream
+ - delete debian/patches/lp293749_better_prefix_netmask_ui.patch
+ - delete debian/patches/lp286421_fix_i18n_bug_286421.patch
+ - update debian/patches/series
+ * adjust patches to new upstream codebase (mostly accessor and
+ anti-bit-rotting measures)
+ - update debian/patches/add_libmbca_support.patch
+ - update debian/patches/20_use_full_vpn_dialog_service_name_path.patch
+ - update debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch
+ - update debian/patches/lp289466_always_show_tray_icon.patch
+ * add support for "easy" bzr builddeb
+ add .bzr-builddeb/default.conf
+ * bump minimum required version for network-manager-dev, libnm-glib-dev
+ and libnm-util-dev
+ - update debian/control
+
+ -- Alexander Sack Mon, 12 Jan 2009 13:31:17 +0100
+
+network-manager-applet (0.7~~svn20081020t000444-0ubuntu2) jaunty; urgency=low
+
+ * fix LP: #289466 - Network Manager 0.7 applet not Appearing if there are
+ managed entries in /etc/network/interfaces; we always call
+ applet_schedule_update_icon in client_init; also we also show the try when
+ there are error conditions (no NM running, no managed device)
+ - add debian/patches/lp289464_always_show_tray_icon.patch
+ - update debian/patches/series
+ * fix LP: #286421 - nm-connection-editor menu item untranslatable;
+ add i18n support to nm-connection-editor.desktop; patch by Timo Jyrinki
+
+ - add debian/patches/lp286421_fix_i18n_bug_286421.patch
+ - update debian/patches/series
+ * fix LP: #268803 - Ubuntu Intrepid: Both Knetworkmanager and Network
+ Manager load on startup; fix xdg autostart .desktop file to
+ "OnlyShowIn=GNOME;XFCE;"
+ - add debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch
+ - update debian/patches/series
+ * fix LP: #293749 - prefix vs. netmask translation inconsistencies in
+ connection-editor causes confusion; we cherry pick rev1009 from upstream
+ svn and backport that.
+ - add debian/patches/lp293749_better_prefix_netmask_ui.patch
+ - update debian/patches/series
+
+ -- Alexander Sack Mon, 01 Dec 2008 14:05:51 +0100
+
+network-manager-applet (0.7~~svn20081020t000444-0ubuntu1) intrepid; urgency=low
+
+ New upstream snapshot Mon 2008-10-20 00:04:44 +0000 (rev 819)
+ * support .cer and .crt extensions for wpa-eap (LP: #272185)
+ - update src/wireless-security/eap-method.c
+ * Don't translate widget labels
+ - update src/connection-editor/ce-page-ip4.glade
+ * updated translations for sv, es, hu, sk, nb, be, he
+
+ -- Alexander Sack Mon, 20 Oct 2008 16:30:10 +0200
+
+network-manager-applet (0.7~~svn20081015t194645-0ubuntu1) intrepid; urgency=low
+
+ * new upstream snapshot Wed 2008-10-15 19:46:45 +0000 (rev 809)
+ * fix LP: #277084 - nm-applet confused by icon name changes during
+ hardy-intrepid upgrade; we ship icons used by NM 0.6 in the NM 0.7
+ to prevent this behaviour
+ - update debian/rules
+
+ -- Alexander Sack Thu, 16 Oct 2008 00:42:34 +0200
+
+network-manager-applet (0.7~~svn20081012t133407-0ubuntu1) intrepid; urgency=low
+
+ * new upstream snapshot Sun 2008-10-12 13:34:07 +0000 (rev 805)
+ - fixes LP: #279387
+ * adjust patch to new upstream code
+ - update debian/patches/add_libmbca_support.patch
+
+ -- Alexander Sack Mon, 13 Oct 2008 21:24:14 +0200
+
+network-manager-applet (0.7~~svn20081005t082522-0ubuntu1) intrepid; urgency=low
+
+ * new upstream snapshot Sun 2008-10-05 08:25:22 +0000 (rev 793)
+ * adjust mbca patch for changed upstream code base
+ - update debian/patches/add_libmbca_support.patch
+
+ -- Alexander Sack Mon, 06 Oct 2008 13:41:27 +0200
+
+network-manager-applet (0.7~~svn20080927t101113-0ubuntu1) intrepid; urgency=low
+
+ * new upstream snapshot Sat 2008-09-27 10:11:13 +0000 (rev 776)
+ [ Antti Kaijanmäki ]
+ * added support for Mobile Broadband Configuration Assistant:
+ - added debian/patches/add_libmbca_support.patch
+ - updated debian/patches/series
+ - added libmbca-dev build-dependency to debian/control
+ - added --with-libmbca to DEB_CONFIGURE_EXTRA_FLAGS in debian/control
+
+ [ Alexander Sack ]
+ * refresh libmbca patch using quilt to prevent diff pollution in future.
+ (quilt refresh --diffstat --no-timestamps -U8)
+ - update debian/patches/add_libmbca_support.patch
+ * generate a uuid for NMSettingConnection which was introduced by recent
+ network manager dbus API changes.
+ - update debian/patches/add_libmbca_support.patch
+ * fix libmbca setting the dialup string instead of the proper number (*99#)
+ for GSM modems
+ - update debian/patches/add_libmbca_support.patch
+ * add new parameter to add_connection call in mbca patch and strip trailing
+ whitespaces uses quilt refresh
+ - update debian/patches/add_libmbca_support.patch
+ * bump build-depends and depends bar on network-manager bits to
+ >= 0.7~~svn20080928
+ - update debian/control
+ * explicitly set connection scope for mbca created connections to
+ NM_CONNECTION_SCOPE_USER
+ - update debian/patches/add_libmbca_support.patch
+ * add libmbca0 to Recommends
+ - update debian/control
+
+ -- Alexander Sack Mon, 29 Sep 2008 22:15:13 +0200
+
+network-manager-applet (0.7~~svn20080907t033843-0ubuntu2) intrepid; urgency=low
+
+ * new upstream snapshot Sun 2008-09-07 03:38:43 +0000 (rev 743)
+ * adjust versioned (build-)depends on network-manager packages to
+ >= 0.7~~svn20080908
+ - update debian/control
+
+ -- Alexander Sack Tue, 09 Sep 2008 16:42:23 +0200
+
+network-manager-applet (0.7~~svn20080817t183748-0ubuntu1) intrepid; urgency=low
+
+ * new upstream snapshot Sun 2008-08-17 18:37:48 +0000 (rev 723)
+ * drop patches applied upstream:
+ - delete debian/patches/01_gcc43.patch
+ - update debian/patches/series
+ * bump build dependency versions on network-manager-dev and friends to (>=
+ 0.7~~svn20080812)
+ - update debian/control
+ * use full path for vpn auth-dialog's as provided by the .name key file in
+ $sysconfdir/NetworkManager/VPN/
+ - add debian/patches/20_use_full_vpn_dialog_service_name_path.patch
+ - update debian/patches/series
+
+ -- Alexander Sack Mon, 18 Aug 2008 21:32:15 +0200
+
+network-manager-applet (0.7~~svn20080721t051503-0ubuntu1) intrepid; urgency=low
+
+ * new upstream snapshot Mon 2008-07-21 05:15:03 +0000 (bzr trunk rev673)
+ * drop manual network config patches - default connection editor is NM
+ - delete debian/patches/01_static_network-admin.patch
+ - delete debian/patches/03_manual_config_available_when_connected.patch
+ - delete debian/patches/13_custom-network-admin.diff
+ - update debian/patches/series
+ * fix gcc 4.3 build failures
+ - add debian/patches/01_gcc43.patch
+ - update debian/patches/series
+ * higher network-manager versions for build and binary depends (>=
+ 0.7~~svn20080720t224551)
+ - update debian/control
+
+ -- Alexander Sack Thu, 07 Aug 2008 01:54:01 +0200
+
+network-manager-applet (0.7~~svn20080121t194048-0ubuntu0~pre6) hardy; urgency=low
+
+ * package 0.7 svn snapshot
+ * add automake1.9 to Build-Depends
+ - update debian/control
+ * add quilt to Build-Depends
+ - update debian/control
+ * add libtool to Build-Depends
+ - update debian/control
+ * add gnome-common to Build-Depends
+ - update debian/control
+ * add libnotify-dev to Build-Depends
+ - update debian/control
+ * add libgnutls-dev to Build-Depends and pass --with-gnutls and
+ --without-nss to configure explicitly
+ - update debian/control
+ - update debian/rules
+ * make libnm-util-dev build dependency versioned to only build against
+ versions that come with libnm-util1
+ - update debian/control
+ * include empty aclocal.m4 file to make cdbs trigger aclocal auto run
+ - add aclocal.m4
+ * switch to use quilt as patchsystem
+ - add debian/patches/series
+ - update debian/rules
+ * unfold Build-Depends and Depends in debian/control to improve legability
+ of patches
+ - update debian/control
+ * bump {Build-}Depends: version for network-manager and friends to a
+ reasonable value (>= 0.7~~svn20080121t191418+eni1-0ubuntu0~pre6)
+ - update debian/control
+ * remove debian/network-manager-gnome/usr/include on install
+ - update debian/rules
+
+ -- Alexander Sack Tue, 22 Jan 2008 17:56:32 +0000
+
+network-manager-applet (0.6.5-0ubuntu11) hardy; urgency=low
+
+ * apply patch to drop gnome-runtime dependencies (LP: #136945) - patch by Jani
+ Monoses
+ - add debian/patches/06_drop_libgnome.patch
+ - add debian/patches/99_autoconf_update.patch
+ * don't use gksu in hardy anymore - policy kit hooray! (LP: #176222)
+ - update debian/patches/01_static_network-admin.patch
+ - update debian/patches/13_custom-network-admin.diff
+
+ [ TJ ]
+ * debian/patches/15_lp124336_missing_prototype_causes_connect_to_other_networks_sigsegv.patch:
+ Fix SIGSEGV caused by pointer>int>pointer conversion on x86_64. (LP: #124336)
+
+ -- Alexander Sack Wed, 09 Jan 2008 13:15:10 +0100
+
+network-manager-applet (0.6.5-0ubuntu10) gutsy; urgency=low
+
+ * debian/control: add missing depends on gksu to allow manual
+ network-configuration even for minimal ubuntu flavours, like the UME.
+ * debian/patches/13_custom-network-admin.diff: use BINDIR "/" MANUAL_CONF_FILE
+ when its available on the system. (LP: #145625)
+ * debian/rules: apply previously forgotten hunk to install network manager
+ applet autostart file to /etc/xdg/autostart/ from LP: #95064.
+ * debian/patches/14_lp123808_dont_start_applet_on_ltsp_client.patch: don't
+ start nm-applet on ltsp client. (LP: #123808)
+
+ -- Alexander Sack Tue, 02 Oct 2007 20:58:18 +0200
+
+network-manager-applet (0.6.5-0ubuntu9) gutsy; urgency=low
+
+ * debian/patches/11_lp95064-enable-xdg-autostart-for-xfce.patch: enable
+ autostart of nm-applet for XFCE nm-applet.desktop. (LP: #95064)
+ * debian/patches/12_lp101978-connection-info-hide-on-delete-event.patch:
+ hide connection info on delete-event; patch by Dima Korzhevin.
+ (LP: #101978).
+
+ -- Alexander Sack Wed, 19 Sep 2007 18:24:28 +0200
+
+network-manager-applet (0.6.5-0ubuntu8) gutsy; urgency=low
+
+ * set Maintainer to ubuntu-core-dev
+ * add XS-Vcs-Bzr tag to point apt-get to the correct branch
+
+ -- Reinhard Tartler Thu, 26 Jul 2007 15:55:06 +0200
+
+network-manager-applet (0.6.5-0ubuntu7) gutsy; urgency=low
+
+ * add 04_nm-vpn-properties_path again, nm-vpn-properties has been moved
+ back again. LP: #127844
+
+ -- Reinhard Tartler Thu, 26 Jul 2007 11:05:45 +0200
+
+network-manager-applet (0.6.5-0ubuntu6) gutsy; urgency=low
+
+ * remove 04_nm-vpn-properties_path.patch. nm-vpn-properties now
+ installed in /usr/bin again.
+
+ -- Reinhard Tartler Thu, 05 Jul 2007 10:25:15 +0200
+
+network-manager-applet (0.6.5-0ubuntu5) gutsy; urgency=low
+
+ * debian/control:
+ - Build-Depends on intltool so the translation template updated
+ (LP: #122547)
+
+ -- Sebastien Bacher Thu, 28 Jun 2007 21:32:29 +0200
+
+network-manager-applet (0.6.5-0ubuntu4) gutsy; urgency=low
+
+ * debian/patches/01_static_network-admin.patch: fix by Peter
+ Clifton; adding NULL check to stop nm-applet from crashing
+ and make encrypted wifi work. (LP: #121228)
+
+ -- Alexander Sack Wed, 27 Jun 2007 12:34:03 +0200
+
+network-manager-applet (0.6.5-0ubuntu3) gutsy; urgency=low
+
+ * Re-import applet patches from network-manager
+
+ * debian/control: tighten build-depends on network-manager to
+ >= 0.6.5-0ubuntu3
+
+ * Make patches apply against applet sources + drop patches that have
+ been applied upstream:
+ - debian/patches/01_static_network-admin.patch: fix diff path for
+ new source layout: gnome/applet -> src/ + update line numbers.
+ - debian/patches/02_manual_means_always_online.diff: fix diff path
+ for new source layout: gnome/applet -> src/ + update line numbers;
+ drop diffs for sources not in this tarball: src/NetworkManagerDbus.c,
+ src/NetworkManagerMain.h and src/nm-device.c.
+ - debian/patches/03_manual_config_available_when_connected.patch: fix
+ diff path for new source layout: gnome/applet -> src/ + update line
+ numbers.
+ - debian/patches/04_nm-vpn-properties_path.patch: nm-vpn-properties
+ are shipped in network-manager pkglibdir
+ - debian/patches/10-po_fr.patch: all but one translation fixes were applied
+ upstream.
+
+ -- Alexander Sack Tue, 26 Jun 2007 10:52:45 +0200
+
+network-manager-applet (0.6.5-0ubuntu2) gutsy; urgency=low
+
+ * Added missing dep network-manager
+
+ -- Anthony Mercatante Fri, 22 Jun 2007 18:24:22 +0200
+
+network-manager-applet (0.6.5-0ubuntu1) gutsy; urgency=low
+
+ * Initial release
+ * Added 21_manual_means_always_online.diff to "patches-not-applied"
+ The gnome applet has been splitted from n-m code, and patch needs
+ to be rewritten
+ * Added 04_nm-vpn-properties_path.patch
+ Fixes path to nm-vpn-properties according to the changes we've done
+ to network-manager package due to bad source splitting
+
+ -- Anthony Mercatante Fri, 15 Jun 2007 12:46:22 +0200
--- network-manager-applet-0.7.1~rc3.orig/debian/copyright
+++ network-manager-applet-0.7.1~rc3/debian/copyright
@@ -0,0 +1,59 @@
+This package was debianized by Anthony Mercatante on
+Fri, 15 Jun 2007 11:54:56 +0200.
+
+It was downloaded from http://ftp.acc.umu.se/pub/GNOME/sources/network-manager-applet/
+
+Upstream author:
+ Dan Williams
+
+Copyright holders:
+ Copyright 2004-2005 Red Hat, Inc.
+ Copyright 2006 Thiago Jung Bauermann
+ Copyright 1999, 2000 Eazel, Inc.
+ Copyright 2002 Anders Carlsson
+ Copyright 2006 Novell, Inc.
+ Copyright 2006 Thiago Jung Bauermann
+ Copyright 2001, 2002 Free Software Foundation
+
+License:
+All the software:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+
+eggtrayicon.c, eggtrayicon.h:
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+menu-items.c:
+ This also uses code from eel-vfs-extentions available under the LGPL
--- network-manager-applet-0.7.1~rc3.orig/debian/compat
+++ network-manager-applet-0.7.1~rc3/debian/compat
@@ -0,0 +1 @@
+5
--- network-manager-applet-0.7.1~rc3.orig/debian/control
+++ network-manager-applet-0.7.1~rc3/debian/control
@@ -0,0 +1,53 @@
+Source: network-manager-applet
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Core Developers
+Original-Maintainer: Anthony Mercatante
+Build-Depends: debhelper (>= 5.0.37),
+ automake1.9,
+ libtool,
+ cdbs,
+ libgnome-keyring-dev,
+ libgnomeui-dev,
+ libpanel-applet2-dev,
+ libglade2-dev,
+ libgconf2-dev,
+ network-manager-dev (>= 0.7.1~rc3),
+ libnm-util-dev (>= 0.7.1~rc3),
+ libnm-glib-dev (>= 0.7.1~rc3),
+ libiw-dev,
+ libxml-parser-perl,
+ docbook-to-man,
+ quilt,
+ libnotify-dev,
+ gnome-common,
+ libnss3-dev,
+ libpolkit-gnome-dev,
+ intltool,
+ libmbca0-dev
+Standards-Version: 3.7.2
+XS-Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/network-manager/gnome.ubuntu.0.6.x
+
+Package: network-manager-gnome
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ network-manager (>= 0.7~~svn20080928),
+ gksu
+Recommends: notification-daemon, libmbca0
+Description: network management framework (GNOME frontend)
+ NetworkManager attempts to keep an active network connection available at all
+ times. It is intended only for the desktop use-case, and is not intended for
+ usage on servers. The point of NetworkManager is to make networking
+ configuration and setup as painless and automatic as possible. If using DHCP,
+ NetworkManager is _intended_ to replace default routes, obtain IP addresses
+ from a DHCP server, and change nameservers whenever it sees fit.
+ .
+ This package contains a systray applet for GNOME's notification area but it
+ also works for other desktop environments which provide a systray like KDE
+ or XFCE.
+ It displays the available networks and allows to easily switch between them.
+ For encrypted networks it will prompt the user for the key/passphrase and it
+ can optionally store them in the gnome-keyring.
+ .
+ Homepage: http://www.gnome.org/projects/NetworkManager/
--- network-manager-applet-0.7.1~rc3.orig/debian/rules
+++ network-manager-applet-0.7.1~rc3/debian/rules
@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+
+DEB_AUTO_UPDATE_LIBTOOL = pre
+DEB_AUTO_UPDATE_AUTOHEADER = 2.50
+DEB_AUTO_UPDATE_ACLOCAL = 1.9
+DEB_AUTO_UPDATE_AUTOMAKE = 1.9 -a -c -f
+DEB_AUTO_UPDATE_AUTOCONF = 2.50
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/gnome.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS = \
+ --without-gnutls \
+ --with-nss \
+ --with-mbca \
+ $(NULL)
+
+build/network-manager-gnome::
+ /usr/bin/docbook-to-man debian/nm-applet.sgml > debian/nm-applet.1
+
+common-binary-arch::
+ rm -rf debian/network-manager-gnome/usr/include/
+ cp -f debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/nm-vpn-active-lock.png \
+ debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/nm-vpn-lock.png
+ cp -f debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/nm-device-wired.png \
+ debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/nm-device-wired-autoip.png
+
+clean::
+ rm -f po/*.gmo
+ rm -f debian/*.1
+ rm -f gtk-doc.make
+ echo "# empty file" > aclocal.m4
+
+pre-build::
+ intltoolize -f -c
+
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/lp328572-dxteam-connect-text.patch
+++ network-manager-applet-0.7.1~rc3/debian/patches/lp328572-dxteam-connect-text.patch
@@ -0,0 +1,52 @@
+=== modified file 'src/applet-device-wifi.c'
+---
+ src/applet-device-wifi.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+Index: network-manager-applet-0.7.1~rc3/src/applet-device-wifi.c
+===================================================================
+--- network-manager-applet-0.7.1~rc3.orig/src/applet-device-wifi.c
++++ network-manager-applet-0.7.1~rc3/src/applet-device-wifi.c
+@@ -1151,17 +1151,16 @@
+ wireless_device_state_changed (NMDevice *device,
+ NMDeviceState new_state,
+ NMDeviceState old_state,
+ NMDeviceStateReason reason,
+ NMApplet *applet)
+ {
+ NMAGConfConnection *gconf_connection;
+ NMAccessPoint *new = NULL;
+- char *msg;
+ char *esc_ssid = NULL;
+
+ new = update_active_ap (device, new_state, applet);
+
+ if (new_state == NM_DEVICE_STATE_DISCONNECTED)
+ queue_avail_access_point_notification (device);
+
+ if (new_state != NM_DEVICE_STATE_ACTIVATED)
+@@ -1174,22 +1173,20 @@
+ esc_ssid = nm_utils_ssid_to_utf8 ((const char *) ssid->data, ssid->len);
+
+ /* Save this BSSID to seen-bssids list */
+ gconf_connection = applet_get_exported_connection_for_device (device, applet);
+ if (gconf_connection && add_seen_bssid (gconf_connection, new))
+ nma_gconf_connection_save (gconf_connection);
+ }
+
+- msg = g_strdup_printf (_("You are now connected to the wireless network '%s'."),
+- esc_ssid ? esc_ssid : _("(none)"));
+ applet_do_notify_with_pref (applet, _("Connection Established"),
+- msg, "nm-device-wireless",
++ esc_ssid ? esc_ssid : _("(none)"),
++ "nm-device-wireless",
+ PREF_DISABLE_CONNECTED_NOTIFICATIONS);
+- g_free (msg);
+ g_free (esc_ssid);
+ }
+
+ static GdkPixbuf *
+ wireless_get_icon (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ char **tip,
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/lp330571_dxteam_wired_connect_text.patch
+++ network-manager-applet-0.7.1~rc3/debian/patches/lp330571_dxteam_wired_connect_text.patch
@@ -0,0 +1,32 @@
+=== modified file 'src/applet-device-wired.c'
+--- a/src/applet-device-wired.c 2009-01-12 17:39:22 +0000
++++ b/src/applet-device-wired.c 2009-02-17 15:29:30 +0000
+@@ -253,23 +253,19 @@
+ if (new_state == NM_DEVICE_STATE_ACTIVATED) {
+ NMConnection *connection;
+ NMSettingConnection *s_con = NULL;
+- char *str = NULL;
++ const char *str = NULL;
+
+ 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));
+- id = s_con ? nm_setting_connection_get_id (s_con) : NULL;
+- if (id)
+- str = g_strdup_printf (_("You are now connected to '%s'."), id);
++ str = s_con ? nm_setting_connection_get_id (s_con) : NULL;
+ }
+
+ applet_do_notify_with_pref (applet,
+- _("Connection Established"),
+- str ? str : _("You are now connected to the wired network."),
++ str ? str : _("Wired network"),
++ _("Connection established"),
+ "nm-device-wired",
+ PREF_DISABLE_CONNECTED_NOTIFICATIONS);
+- g_free (str);
+ }
+ }
+
+
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/lp331799_sensible_notify_actions.patch
+++ network-manager-applet-0.7.1~rc3/debian/patches/lp331799_sensible_notify_actions.patch
@@ -0,0 +1,115 @@
+=== modified file 'src/applet.c'
+---
+ src/applet.c | 13 ++++++++++++-
+ src/applet.h | 3 +++
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+Index: network-manager-applet-0.7.1~rc1+20090219+bzr974/src/applet.c
+===================================================================
+--- network-manager-applet-0.7.1~rc1+20090219+bzr974.orig/src/applet.c
++++ network-manager-applet-0.7.1~rc1+20090219+bzr974/src/applet.c
+@@ -65,16 +65,17 @@
+ #include "applet-device-gsm.h"
+ #include "applet-device-cdma.h"
+ #include "applet-dialogs.h"
+ #include "vpn-password-dialog.h"
+ #include "applet-dbus-manager.h"
+ #include "utils.h"
+ #include "gconf-helpers.h"
+
++#define NOTIFY_CAPS_ACTIONS_KEY "actions"
+
+ G_DEFINE_TYPE(NMApplet, nma, G_TYPE_OBJECT)
+
+ static NMActiveConnection *
+ applet_get_best_activating_connection (NMApplet *applet, NMDevice **device)
+ {
+ NMActiveConnection *best = NULL;
+ NMDevice *best_dev = NULL;
+@@ -391,17 +392,17 @@
+ notify = notify_notification_new (summary, message,
+ icon ? icon : GTK_STOCK_NETWORK, NULL);
+ applet->notification = notify;
+
+ notify_notification_attach_to_status_icon (notify, applet->status_icon);
+ notify_notification_set_urgency (notify, urgency);
+ notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+
+- if (action1) {
++ if (applet->notify_with_actions && action1) {
+ notify_notification_add_action (notify, action1, action1_label,
+ action1_cb, action1_user_data, NULL);
+ }
+
+ if (!notify_notification_show (notify, &error)) {
+ g_warning ("Failed to show notification: %s", error->message);
+ g_error_free (error);
+ }
+@@ -2521,16 +2522,17 @@
+
+ static GObject *
+ constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *construct_props)
+ {
+ NMApplet *applet;
+ AppletDBusManager *dbus_mgr;
++ GList *server_caps;
+
+ applet = NM_APPLET (G_OBJECT_CLASS (nma_parent_class)->constructor (type, n_props, construct_props));
+
+ g_set_application_name (_("NetworkManager Applet"));
+ gtk_window_set_default_icon_name (GTK_STOCK_NETWORK);
+
+ applet->glade_file = g_build_filename (GLADEDIR, "applet.glade", NULL);
+ if (!applet->glade_file || !g_file_test (applet->glade_file, G_FILE_TEST_IS_REGULAR)) {
+@@ -2551,16 +2553,25 @@
+ /* Load pixmaps and create applet widgets */
+ if (!setup_widgets (applet))
+ goto error;
+ nma_icons_init (applet);
+
+ if (!notify_is_initted ())
+ notify_init ("NetworkManager");
+
++ server_caps = notify_get_server_caps();
++ if (g_list_find (server_caps, NOTIFY_CAPS_ACTIONS_KEY))
++ applet->notify_with_actions = TRUE;
++ else
++ applet->notify_with_actions = FALSE;
++
++ g_list_foreach (server_caps, (GFunc) g_free, NULL);
++ g_list_free (server_caps);
++
+ dbus_mgr = applet_dbus_manager_get ();
+ if (dbus_mgr == NULL) {
+ nm_warning ("Couldn't initialize the D-Bus manager.");
+ g_object_unref (applet);
+ return NULL;
+ }
+
+ applet->dbus_settings = (NMDBusSettings *) nm_dbus_settings_system_new (applet_dbus_manager_get_connection (dbus_mgr));
+Index: network-manager-applet-0.7.1~rc1+20090219+bzr974/src/applet.h
+===================================================================
+--- network-manager-applet-0.7.1~rc1+20090219+bzr974.orig/src/applet.h
++++ network-manager-applet-0.7.1~rc1+20090219+bzr974/src/applet.h
+@@ -151,16 +151,19 @@
+ GtkWidget * wifi_enabled_item;
+ guint wifi_enabled_toggled_id;
+ GtkWidget * info_menu_item;
+ GtkWidget * connections_menu_item;
+
+ GladeXML * info_dialog_xml;
+ NotifyNotification* notification;
+
++ /* Notification stuff */
++ gboolean notify_with_actions;
++
+ #ifdef WITH_MBCA
+ GSList *mbca_assistants; /* list of UdiAssistant */
+ GModule *mbca_module;
+ void (*mbca_assistant_abort_func) (MBCAAssistant*);
+ void (*mbca_assistant_present_func) (MBCAAssistant*);
+ MBCAAssistant* (*mbca_assistant_new_func) ();
+ gint (*mbca_assistant_run_for_device_func) (MBCAAssistant*,
+ MBCADeviceType,
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/lp337960_dxteam_notification_icon_names.diff
+++ network-manager-applet-0.7.1~rc3/debian/patches/lp337960_dxteam_notification_icon_names.diff
@@ -0,0 +1,95 @@
+=== modified file 'src/applet-device-gsm.c'
+---
+ src/applet-device-gsm.c | 2 +-
+ src/applet-device-wifi.c | 4 ++--
+ src/applet-device-wired.c | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+Index: network-manager-applet-0.7.1~rc3/src/applet-device-gsm.c
+===================================================================
+--- network-manager-applet-0.7.1~rc3.orig/src/applet-device-gsm.c
++++ network-manager-applet-0.7.1~rc3/src/applet-device-gsm.c
+@@ -495,17 +495,17 @@
+ if (connection) {
+ s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+ str = s_con ? nm_setting_connection_get_id (s_con) : NULL;
+ }
+
+ applet_do_notify_with_pref (applet,
+ str ? str : _("GSM network."),
+ _("Connection established"),
+- "nm-device-wwan",
++ "notification-gsm-high",
+ PREF_DISABLE_CONNECTED_NOTIFICATIONS);
+ }
+ }
+
+ #ifdef WITH_MBCA
+ typedef struct {
+ NMDevice* device;
+ NMApplet* applet;
+Index: network-manager-applet-0.7.1~rc3/src/applet-device-wifi.c
+===================================================================
+--- network-manager-applet-0.7.1~rc3.orig/src/applet-device-wifi.c
++++ network-manager-applet-0.7.1~rc3/src/applet-device-wifi.c
+@@ -971,17 +971,17 @@
+ /* Avoid notifying too often */
+ g_get_current_time (&timeval);
+ data->last_notification_time = timeval.tv_sec;
+
+ applet_do_notify (applet,
+ NOTIFY_URGENCY_LOW,
+ _("Wireless Networks Available"),
+ _("Click on this icon to connect to a wireless network"),
+- "nm-device-wireless",
++ "notification-network-wireless-full",
+ "dont-show",
+ _("Don't show this message again"),
+ wifi_available_dont_show_cb,
+ applet);
+ return FALSE;
+ }
+
+ static void
+@@ -1175,17 +1175,17 @@
+ /* Save this BSSID to seen-bssids list */
+ gconf_connection = applet_get_exported_connection_for_device (device, applet);
+ if (gconf_connection && add_seen_bssid (gconf_connection, new))
+ nma_gconf_connection_save (gconf_connection);
+ }
+
+ applet_do_notify_with_pref (applet, _("Connection Established"),
+ esc_ssid ? esc_ssid : _("(none)"),
+- "nm-device-wireless",
++ "notification-network-wireless-full",
+ PREF_DISABLE_CONNECTED_NOTIFICATIONS);
+ g_free (esc_ssid);
+ }
+
+ static GdkPixbuf *
+ wireless_get_icon (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+Index: network-manager-applet-0.7.1~rc3/src/applet-device-wired.c
+===================================================================
+--- network-manager-applet-0.7.1~rc3.orig/src/applet-device-wired.c
++++ network-manager-applet-0.7.1~rc3/src/applet-device-wired.c
+@@ -256,17 +256,17 @@
+ if (connection) {
+ s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+ str = s_con ? nm_setting_connection_get_id (s_con) : NULL;
+ }
+
+ applet_do_notify_with_pref (applet,
+ str ? str : _("Wired network"),
+ _("Connection established"),
+- "nm-device-wired",
++ "notification-network-ethernet-connected",
+ PREF_DISABLE_CONNECTED_NOTIFICATIONS);
+ }
+ }
+
+ static GdkPixbuf *
+ wired_get_icon (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/14_lp123808_dont_start_applet_on_ltsp_client.patch
+++ network-manager-applet-0.7.1~rc3/debian/patches/14_lp123808_dont_start_applet_on_ltsp_client.patch
@@ -0,0 +1,11 @@
+--- network-manager-applet-0.6.5/src/applet.c.orig 2007-10-02 20:53:36.000000000 +0200
++++ network-manager-applet-0.6.5/src/applet.c 2007-10-02 20:54:46.000000000 +0200
+@@ -132,7 +132,7 @@ static void nma_init (NMApplet *applet)
+ applet->animation_step = 0;
+ glade_gnome_init ();
+
+- if (!nma_icons_init (applet))
++ if ((!nma_icons_init (applet)) || (g_getenv("LTSP_CLIENT")))
+ return;
+
+ /* gtk_window_set_default_icon_from_file (ICONDIR"/NMApplet/wireless-applet.png", NULL); */
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/series
+++ network-manager-applet-0.7.1~rc3/debian/patches/series
@@ -0,0 +1,11 @@
+add_libmbca_support.patch
+20_use_full_vpn_dialog_service_name_path.patch
+lp289466_always_show_tray_icon.patch
+lp268803_xdg_autostart_gnome_xfce_only.patch
+lp295788_xfce_menu_entry.patch
+lp331799_sensible_notify_actions.patch
+lp328572-dxteam-connect-text.patch
+lp330571_dxteam_wired_connect_text.patch
+lp330608_dxteam_gsm_connect_text.patch
+lp337960_dxteam_notification_icon_names.diff
+lp337960_dxteam_notification_icon_names_part2-images.diff
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/add_libmbca_support.patch
+++ network-manager-applet-0.7.1~rc3/debian/patches/add_libmbca_support.patch
@@ -0,0 +1,931 @@
+---
+ configure.ac | 10 +
+ src/applet-device-gsm.c | 233 ++++++++++++++++++++++++++++-
+ src/applet.c | 51 ++++++
+ src/applet.h | 31 +++
+ src/connection-editor/nm-connection-list.c | 200 ++++++++++++++++++++++++
+ src/connection-editor/nm-connection-list.h | 14 +
+ 6 files changed, 537 insertions(+), 2 deletions(-)
+
+Index: network-manager-applet-0.7.1~rc1+20090219+bzr974/src/applet-device-gsm.c
+===================================================================
+--- network-manager-applet-0.7.1~rc1+20090219+bzr974.orig/src/applet-device-gsm.c
++++ network-manager-applet-0.7.1~rc1+20090219+bzr974/src/applet-device-gsm.c
+@@ -35,42 +35,238 @@
+ #include
+ #include
+ #include
+
+ #include "applet.h"
+ #include "applet-device-gsm.h"
+ #include "utils.h"
+
++#ifdef WITH_MBCA
++#include
++#include
++#include
++#include
++#endif
++
+ typedef struct {
+ NMApplet *applet;
+ NMDevice *device;
+ NMConnection *connection;
+ } GSMMenuItemInfo;
+
+ static void
+ gsm_menu_item_info_destroy (gpointer data)
+ {
+ g_slice_free (GSMMenuItemInfo, data);
+ }
+
++#ifdef WITH_MBCA
++static void
++assistant_state_changed_cb (MBCAAssistant* assistant,
++ MBCAAssistantState state,
++ gpointer data)
++{
++ NMApplet *applet = data;
++ GSList* iter;
++
++ NMAGConfConnection *exported;
++
++ NMConnection *connection;
++ NMSettingGsm *s_gsm;
++ NMSettingSerial *s_serial;
++ NMSettingPPP *s_ppp;
++ NMSettingConnection *s_con;
++
++ NMSettingIP4Config* ipv4conf;
++ gboolean ignore_auto_dns = FALSE;
++ GArray *dns_servers = FALSE;
++ const char *method;
++
++ MBCAConfiguration* conf;
++
++ if (!applet_open_mbca (applet))
++ g_return_if_reached (); /* this cb should not be called without
++ * libmbca */
++
++ switch (state)
++ {
++ case MBCA_STATE_READY:
++ case MBCA_STATE_RUNNING:
++ {
++ break;
++ }
++ case MBCA_STATE_DONE:
++ {
++ conf = applet->mbca_assistant_get_configuration_func (assistant);
++ connection = nm_connection_new ();
++
++ s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
++ nm_connection_add_setting (connection, NM_SETTING (s_con));
++
++ ipv4conf = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ());
++ nm_connection_add_setting (connection, NM_SETTING (ipv4conf));
++
++ g_object_set (G_OBJECT(s_con),
++ "id", conf->name,
++ "type", NM_SETTING_GSM_SETTING_NAME,
++ "uuid", nm_utils_uuid_generate (),
++ "autoconnect", FALSE,
++ NULL);
++
++ /* Serial setting */
++ s_serial = (NMSettingSerial *) nm_setting_serial_new ();
++ g_object_set (G_OBJECT(s_serial),
++ "baud", 115200,
++ "bits", 8,
++ "parity", "n",
++ "stopbits", 1,
++ NULL);
++ nm_connection_add_setting (connection, NM_SETTING (s_serial));
++
++ method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
++
++ s_gsm = NM_SETTING_GSM (nm_setting_gsm_new ());
++
++ g_object_set (G_OBJECT(s_gsm),
++ "number", "*99#",
++ "apn", conf->provider->gsm.apn,
++ "username", conf->provider->username,
++ "password", conf->provider->password,
++ NULL);
++
++ if (conf->provider->dns1) {
++ struct in_addr tmp_addr;
++ ignore_auto_dns = TRUE;
++ dns_servers = g_array_new (FALSE, FALSE, sizeof (guint));
++
++ inet_aton (conf->provider->dns1, &tmp_addr);
++ g_array_append_val (dns_servers, tmp_addr.s_addr);
++
++ if (conf->provider->dns2) {
++ inet_aton (conf->provider->dns2, &tmp_addr);
++ g_array_append_val (dns_servers, tmp_addr.s_addr);
++ }
++ }
++
++ /* TODO: gateway */
++
++ g_object_set (ipv4conf,
++ NM_SETTING_IP4_CONFIG_METHOD, method,
++ NM_SETTING_IP4_CONFIG_DNS, dns_servers,
++ NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns,
++ NULL);
++
++ nm_connection_add_setting (connection, NM_SETTING (s_gsm));
++
++ s_ppp = (NMSettingPPP *) nm_setting_ppp_new ();
++ nm_connection_add_setting (connection, NM_SETTING (s_ppp));
++
++
++ applet->mbca_free_configuration_func (conf);
++ if (dns_servers)
++ g_array_free (dns_servers, TRUE);
++
++ exported = nma_gconf_settings_add_connection (applet->gconf_settings, connection);
++ if (!exported) {
++ g_object_unref (connection);
++ g_return_if_reached ();
++ }
++ g_object_unref (connection);
++
++ applet_do_notify (applet, NOTIFY_URGENCY_LOW,
++ _("New Configuration Created"),
++ _("You can activate the connection by clicking this icon.\n"
++ "\n"
++ "Use connection editor to add new and to change settings if necessary"),
++ "nm-device-wwan", NULL, NULL, NULL, NULL);
++
++ /* FALLTHROUGH */
++ }
++ case MBCA_STATE_ABORTED:
++ {
++ for (iter = applet->mbca_assistants; iter; iter = iter->next){
++ if (((UdiAssistant*)(iter->data))->assistant == assistant) {
++ UdiAssistant* ua = iter->data;
++ applet->mbca_assistants = g_slist_remove_all (applet->mbca_assistants,
++ ua);
++
++ g_object_unref (G_OBJECT (ua->assistant));
++ g_free (ua->udi);
++ g_free (ua);
++
++ }
++ }
++ break;
++ }
++ default:
++ {
++ g_return_if_reached ();
++ }
++ }
++}
++#endif
++
+ #define DEFAULT_GSM_NAME _("Auto Mobile Broadband (GSM) connection")
+
+ static NMConnection *
+ gsm_new_auto_connection (NMDevice *device,
+ NMApplet *applet,
+ gpointer user_data)
+ {
+ NMConnection *connection;
+ NMSettingGsm *s_gsm;
+ NMSettingSerial *s_serial;
+ NMSettingPPP *s_ppp;
+ NMSettingConnection *s_con;
+ char *uuid;
+
++#ifdef WITH_MBCA
++ UdiAssistant* ua;
++ const gchar* udi;
++ GSList* iter;
++
++ if (applet_open_mbca (applet))
++ {
++ udi = nm_device_get_udi (device);
++
++ for (iter = applet->mbca_assistants; iter; iter = iter->next) {
++ UdiAssistant* tmp = iter->data;
++ if (!strcmp (tmp->udi, udi))
++ {
++ applet->mbca_assistant_present_func (tmp->assistant);
++ break;
++ }
++ }
++ if (!iter)
++ {
++ /* not found */
++ ua = g_malloc (sizeof (UdiAssistant));
++ ua->udi = g_strdup (udi);
++ ua->assistant = applet->mbca_assistant_new_func ();
++ g_signal_connect (G_OBJECT (ua->assistant), "state-changed",
++ G_CALLBACK (assistant_state_changed_cb), applet);
++ applet->mbca_assistants = g_slist_prepend (applet->mbca_assistants, ua);
++ applet->mbca_assistant_run_for_device_func (ua->assistant,
++ MBCA_DEVICE_PSEUDO,
++ NULL, NULL);
++ }
++
++ nm_warning ("There's a new GSM modem being configured and no "
++ "configuration is yet available. You can safely ignore the "
++ "next warninig, if any, about missing default configuration."
++ );
++ return NULL;
++ }
++ else
++ {
++ /* continue to default code */
++ }
++#endif
++
+ connection = nm_connection_new ();
+
+ s_gsm = NM_SETTING_GSM (nm_setting_gsm_new ());
+ /* This should be a sensible default as it's seems to be quite standard */
+ g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL);
+ nm_connection_add_setting (connection, NM_SETTING (s_gsm));
+
+ /* Serial setting */
+@@ -150,19 +346,25 @@
+ }
+
+ static void
+ add_default_connection_item (NMDevice *device,
+ GtkWidget *menu,
+ NMApplet *applet)
+ {
+ GSMMenuItemInfo *info;
+- GtkWidget *item;
++ GtkWidget *item = NULL;
++
++#ifdef WITH_MBCA
++ if (applet_open_mbca (applet))
++ item = gtk_check_menu_item_new_with_label (_("Configure..."));
++#endif
++ if (!item)
++ item = gtk_check_menu_item_new_with_label (DEFAULT_GSM_NAME);
+
+- item = gtk_check_menu_item_new_with_label (DEFAULT_GSM_NAME);
+ gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (item), TRUE);
+
+ info = g_slice_new0 (GSMMenuItemInfo);
+ info->applet = applet;
+ info->device = g_object_ref (G_OBJECT (device));
+
+ g_signal_connect_data (item, "activate",
+ G_CALLBACK (gsm_menu_item_activate),
+@@ -303,16 +505,39 @@
+ _("Connection Established"),
+ str ? str : _("You are now connected to the GSM network."),
+ "nm-device-wwan",
+ PREF_DISABLE_CONNECTED_NOTIFICATIONS);
+ g_free (str);
+ }
+ }
+
++#ifdef WITH_MBCA
++typedef struct {
++ NMDevice* device;
++ NMApplet* applet;
++} NotifyConfigureNewDeviceCbData;
++
++static void
++gsm_device_added (NMDevice *device, NMApplet *applet)
++{
++ GSList *connections, *all;
++
++ if (!applet_open_mbca (applet))
++ return;
++
++ all = applet_get_all_connections (applet);
++ connections = utils_filter_connections_for_device (device, all);
++ g_slist_free (all);
++
++ if (g_slist_length (connections) == 0)
++ gsm_new_auto_connection (device, applet, NULL);
++}
++#endif
++
+ static GdkPixbuf *
+ gsm_get_icon (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ char **tip,
+ NMApplet *applet)
+ {
+ NMSettingConnection *s_con;
+@@ -649,11 +874,15 @@
+ return NULL;
+
+ dclass->new_auto_connection = gsm_new_auto_connection;
+ dclass->add_menu_item = gsm_add_menu_item;
+ dclass->device_state_changed = gsm_device_state_changed;
+ dclass->get_icon = gsm_get_icon;
+ dclass->get_secrets = gsm_get_secrets;
+
++#ifdef WITH_MBCA
++ dclass->device_added = gsm_device_added;
++#endif
++
+ return dclass;
+ }
+
+Index: network-manager-applet-0.7.1~rc1+20090219+bzr974/src/applet.c
+===================================================================
+--- network-manager-applet-0.7.1~rc1+20090219+bzr974.orig/src/applet.c
++++ network-manager-applet-0.7.1~rc1+20090219+bzr974/src/applet.c
+@@ -1021,16 +1021,62 @@
+ item = gtk_menu_item_new_with_label (_("device not managed"));
+
+ if (item)
+ gtk_widget_set_sensitive (item, FALSE);
+
+ return item;
+ }
+
++#ifdef WITH_MBCA
++gboolean
++applet_open_mbca (NMApplet *applet)
++{
++ if (applet->mbca_module)
++ return TRUE;
++
++ applet->mbca_module = g_module_open ("libmbca.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
++ if (!applet->mbca_module)
++ return FALSE;
++
++ if (!g_module_symbol (applet->mbca_module,
++ "mbca_assistant_abort",
++ ((gpointer)(&applet->mbca_assistant_abort_func))))
++ g_warn_if_reached ();
++
++ if (!g_module_symbol (applet->mbca_module,
++ "mbca_assistant_present",
++ (gpointer)(&applet->mbca_assistant_present_func)))
++ g_warn_if_reached ();
++
++ if (!g_module_symbol (applet->mbca_module,
++ "mbca_assistant_new",
++ (gpointer)(&applet->mbca_assistant_new_func)))
++ g_warn_if_reached ();
++
++ if (!g_module_symbol (applet->mbca_module,
++ "mbca_assistant_run_for_device",
++ (gpointer)(&applet->mbca_assistant_run_for_device_func)))
++ g_warn_if_reached ();
++
++ if (!g_module_symbol (applet->mbca_module,
++ "mbca_assistant_get_configuration",
++ (gpointer)(&applet->mbca_assistant_get_configuration_func)))
++ g_warn_if_reached ();
++
++ if (!g_module_symbol (applet->mbca_module,
++ "mbca_free_configuration",
++ (gpointer)(&applet->mbca_free_configuration_func)))
++ g_warn_if_reached ();
++
++ return TRUE;
++}
++#endif
++
++
+ static guint32
+ nma_menu_add_devices (GtkWidget *menu, NMApplet *applet)
+ {
+ const GPtrArray *temp = NULL;
+ GSList *devices = NULL, *iter = NULL;
+ gint n_wifi_devices = 0;
+ gint n_usable_wifi_devices = 0;
+ gint n_wired_devices = 0;
+@@ -2615,16 +2661,21 @@
+
+ static void nma_init (NMApplet *applet)
+ {
+ applet->animation_id = 0;
+ applet->animation_step = 0;
+ applet->icon_theme = NULL;
+ applet->notification = NULL;
+ applet->size = -1;
++
++#ifdef WITH_MBCA
++ applet->mbca_assistants = NULL;
++ applet->mbca_module = NULL;
++#endif
+ }
+
+ enum {
+ PROP_0,
+ PROP_LOOP,
+ LAST_PROP
+ };
+
+Index: network-manager-applet-0.7.1~rc1+20090219+bzr974/src/applet.h
+===================================================================
+--- network-manager-applet-0.7.1~rc1+20090219+bzr974.orig/src/applet.h
++++ network-manager-applet-0.7.1~rc1+20090219+bzr974/src/applet.h
+@@ -42,26 +42,38 @@
+ #include
+ #include
+ #include
+ #include
+ #include
+ #include
+ #include
+
++#ifdef WITH_MBCA
++#include
++#endif
++
+ #include "applet-dbus-manager.h"
+ #include "nma-gconf-settings.h"
+
+ #define NM_TYPE_APPLET (nma_get_type())
+ #define NM_APPLET(object) (G_TYPE_CHECK_INSTANCE_CAST((object), NM_TYPE_APPLET, NMApplet))
+ #define NM_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_APPLET, NMAppletClass))
+ #define NM_IS_APPLET(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), NM_TYPE_APPLET))
+ #define NM_IS_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_APPLET))
+ #define NM_APPLET_GET_CLASS(object)(G_TYPE_INSTANCE_GET_CLASS((object), NM_TYPE_APPLET, NMAppletClass))
+
++#ifdef WITH_MBCA
++typedef struct
++{
++ char* udi;
++ MBCAAssistant* assistant;
++} UdiAssistant;
++#endif
++
+ typedef struct
+ {
+ GObjectClass parent_class;
+ } NMAppletClass;
+
+ #define APPLET_PREFS_PATH "/apps/nm-applet"
+ #define PREF_DISABLE_CONNECTED_NOTIFICATIONS APPLET_PREFS_PATH "/disable-connected-notifications"
+ #define PREF_DISABLE_DISCONNECTED_NOTIFICATIONS APPLET_PREFS_PATH "/disable-disconnected-notifications"
+@@ -138,16 +150,30 @@
+ guint networking_enabled_toggled_id;
+ GtkWidget * wifi_enabled_item;
+ guint wifi_enabled_toggled_id;
+ GtkWidget * info_menu_item;
+ GtkWidget * connections_menu_item;
+
+ GladeXML * info_dialog_xml;
+ NotifyNotification* notification;
++
++#ifdef WITH_MBCA
++ GSList *mbca_assistants; /* list of UdiAssistant */
++ GModule *mbca_module;
++ void (*mbca_assistant_abort_func) (MBCAAssistant*);
++ void (*mbca_assistant_present_func) (MBCAAssistant*);
++ MBCAAssistant* (*mbca_assistant_new_func) ();
++ gint (*mbca_assistant_run_for_device_func) (MBCAAssistant*,
++ MBCADeviceType,
++ const gchar*,
++ const gchar*);
++ MBCAConfiguration* (*mbca_assistant_get_configuration_func) (MBCAAssistant*);
++ void (*mbca_free_configuration_func) (MBCAConfiguration*);
++#endif
+ } NMApplet;
+
+
+ struct NMADeviceClass {
+ NMConnection * (*new_auto_connection) (NMDevice *device,
+ NMApplet *applet,
+ gpointer user_data);
+
+@@ -220,11 +246,16 @@
+ void applet_do_notify_with_pref (NMApplet *applet,
+ const char *summary,
+ const char *message,
+ const char *icon,
+ const char *pref);
+
+ NMConnection * applet_find_active_connection_for_device (NMDevice *device,
+ NMApplet *applet,
++
+ NMActiveConnection **out_active);
+
++#ifdef WITH_MBCA
++gboolean applet_open_mbca (NMApplet *applet);
++#endif
++
+ #endif
+Index: network-manager-applet-0.7.1~rc1+20090219+bzr974/src/connection-editor/nm-connection-list.c
+===================================================================
+--- network-manager-applet-0.7.1~rc1+20090219+bzr974.orig/src/connection-editor/nm-connection-list.c
++++ network-manager-applet-0.7.1~rc1+20090219+bzr974/src/connection-editor/nm-connection-list.c
+@@ -46,16 +46,23 @@
+ #include
+ #include
+ #include
+ #include
+ #include
+ #include
+ #include
+
++#ifdef WITH_MBCA
++#include
++#include
++#include
++#include
++#endif
++
+ #include "nm-connection-editor.h"
+ #include "nm-connection-list.h"
+ #include "gconf-helpers.h"
+ #include "mobile-wizard.h"
+ #include "utils.h"
+ #include "vpn-helpers.h"
+
+ G_DEFINE_TYPE (NMConnectionList, nm_connection_list, G_TYPE_OBJECT)
+@@ -98,16 +105,52 @@
+
+ if (parent)
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
++#ifdef WITH_MBCA
++static gboolean
++open_mbca (NMConnectionList *list)
++{
++ if (list->mbca_module)
++ return TRUE;
++
++ list->mbca_module = g_module_open ("libmbca.so.0", G_MODULE_BIND_LAZY |
++ G_MODULE_BIND_LOCAL);
++ if (!list->mbca_module)
++ return FALSE;
++
++ if (!g_module_symbol (list->mbca_module,
++ "mbca_assistant_new",
++ (gpointer)(&list->mbca_assistant_new_func)));
++ g_warn_if_reached ();
++
++ if (!g_module_symbol (list->mbca_module,
++ "mbca_assistant_run_for_device",
++ (gpointer)(&list->mbca_assistant_run_for_device_func)));
++ g_warn_if_reached ();
++
++ if (!g_module_symbol (list->mbca_module,
++ "mbca_assistant_get_configuration",
++ (gpointer)(&list->mbca_assistant_get_configuration_func)));
++ g_warn_if_reached ();
++
++ if (!g_module_symbol (list->mbca_module,
++ "mbca_free_configuration",
++ (gpointer)(&list->mbca_free_configuration_func)));
++ g_warn_if_reached ();
++
++ return TRUE;
++}
++#endif
++
+ static NMExportedConnection *
+ get_active_connection (GtkTreeView *treeview)
+ {
+ GtkTreeSelection *selection;
+ GList *selected_rows;
+ GtkTreeModel *model = NULL;
+ GtkTreeIter iter;
+ NMExportedConnection *exported = NULL;
+@@ -814,25 +857,155 @@
+ NM_SETTING_SERIAL_BITS, 8,
+ NM_SETTING_SERIAL_PARITY, 'n',
+ NM_SETTING_SERIAL_STOPBITS, 1,
+ NULL);
+
+ nm_connection_add_setting (connection, NM_SETTING (s_serial));
+ }
+
++#ifdef WITH_MBCA
++static void
++mbca_assistant_state_changed_cb (MBCAAssistant* assistant,
++ MBCAAssistantState state,
++ gpointer user_data)
++{
++ NMConnection *connection = NULL;
++ NMSettingConnection *s_con;
++ NMSetting *type_setting = NULL;
++ MBCAConfiguration* conf;
++
++ NMConnectionList *list = user_data;
++
++ NMSettingIP4Config* ipv4conf;
++ gboolean ignore_auto_dns = FALSE;
++ GArray *dns_servers = FALSE;
++ const char *method;
++
++ switch (state) {
++ case MBCA_STATE_READY:
++ case MBCA_STATE_RUNNING:
++ return;
++ case MBCA_STATE_DONE:
++
++ /* this function should never get called without a prior usage of
++ * libmbca in create_new_connection_for_type
++ */
++ g_return_if_fail (open_mbca (list));
++
++ connection = nm_connection_new ();
++ nm_connection_set_scope (connection, NM_CONNECTION_SCOPE_USER);
++
++ s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
++ nm_connection_add_setting (connection, NM_SETTING (s_con));
++
++ ipv4conf = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ());
++ nm_connection_add_setting (connection, NM_SETTING (ipv4conf));
++
++ conf = list->mbca_assistant_get_configuration_func (assistant);
++
++ g_object_set (G_OBJECT (s_con),
++ "uuid", nm_utils_uuid_generate (),
++ "id", conf->name,
++ "autoconnect", FALSE,
++ NULL);
++
++ add_default_serial_setting (connection);
++
++ method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
++
++ if (conf->provider->type == MBCA_NETWORK_GSM) {
++ NMSettingGsm *s_gsm;
++
++ g_object_set (G_OBJECT(s_con),
++ "type", NM_SETTING_GSM_SETTING_NAME,
++ NULL);
++
++ type_setting = nm_setting_gsm_new ();
++ s_gsm = NM_SETTING_GSM (type_setting);
++ g_object_set(G_OBJECT(s_gsm),
++ "number", "*99#" /* De-facto standard for GSM */,
++ "apn", conf->provider->gsm.apn,
++ "username", conf->provider->username,
++ "password", conf->provider->password,
++ NULL);
++
++ if (conf->provider->dns1) {
++ struct in_addr tmp_addr;
++ ignore_auto_dns = TRUE;
++ dns_servers = g_array_new (FALSE, FALSE, sizeof (guint));
++
++ inet_aton (conf->provider->dns1, &tmp_addr);
++ g_array_append_val (dns_servers, tmp_addr.s_addr);
++
++ if (conf->provider->dns2) {
++ inet_aton (conf->provider->dns2, &tmp_addr);
++ g_array_append_val (dns_servers, tmp_addr.s_addr);
++ }
++ }
++
++ /* TODO: gateway */
++
++ } else if (conf->provider->type == MBCA_NETWORK_CDMA) {
++ g_object_set (G_OBJECT (s_con),
++ "type", NM_SETTING_CDMA_SETTING_NAME,
++ NULL);
++
++ type_setting = nm_setting_cdma_new ();
++ g_object_set (G_OBJECT (type_setting),
++ "number", "#777" /* De-facto standard for CDMA */,
++ "username", conf->provider->username,
++ "password", conf->provider->password,
++ NULL);
++ }
++ nm_connection_add_setting (connection, nm_setting_ppp_new ());
++
++ g_object_set (ipv4conf,
++ NM_SETTING_IP4_CONFIG_METHOD, method,
++ NM_SETTING_IP4_CONFIG_DNS, dns_servers,
++ NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns,
++ NULL);
++
++ if (type_setting) {
++ nm_connection_add_setting (connection, type_setting);
++ } else {
++ g_object_unref (connection);
++ connection = NULL;
++ }
++
++ add_connection (list, NULL, connection, NULL, NULL);
++ g_hash_table_remove (list->editors, connection);
++
++ list->mbca_free_configuration_func (conf);
++ if (dns_servers)
++ g_array_free (dns_servers, TRUE);
++ /* FALLTHROUGH */
++
++ case MBCA_STATE_ABORTED:
++ g_object_unref (assistant);
++ break;
++ default:
++ g_warn_if_reached ();
++ }
++}
++#endif
++
+ static NMConnection *
+ create_new_connection_for_type (NMConnectionList *list, const char *connection_type)
+ {
+ GType ctype;
+ NMConnection *connection = NULL;
+ NMSettingConnection *s_con;
+ NMSetting *type_setting = NULL;
+ char *id, *uuid;
+ GType mb_type;
++#ifdef WITH_MBCA
++ MBCAAssistant *assistant = NULL;
++ gboolean use_mbca = FALSE;
++#endif
+
+ ctype = nm_connection_lookup_setting_type (connection_type);
+
+ connection = nm_connection_new ();
+ nm_connection_set_scope (connection, NM_CONNECTION_SCOPE_USER);
+ s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
+ uuid = nm_utils_uuid_generate ();
+ g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL);
+@@ -859,16 +1032,20 @@
+ NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
+ NULL);
+ g_free (id);
+
+ type_setting = nm_setting_wireless_new ();
+ s_wireless = NM_SETTING_WIRELESS (type_setting);
+ g_object_set (s_wireless, NM_SETTING_WIRELESS_MODE, "infrastructure", NULL);
+ } else if ((ctype == NM_TYPE_SETTING_GSM) || (ctype == NM_TYPE_SETTING_CDMA)) {
++#ifdef WITH_MBCA
++ use_mbca = open_mbca (list);
++ if (!use_mbca) {
++#endif
+ /* Since GSM is a placeholder for both GSM and CDMA; ask the user which
+ * one they really want.
+ */
+ mb_type = mobile_wizard_ask_connection_type ();
+ if (mb_type == NM_TYPE_SETTING_GSM) {
+ NMSettingGsm *s_gsm;
+
+ id = get_next_available_name (list, _("GSM connection %d"));
+@@ -905,16 +1082,30 @@
+
+ /* De-facto standard for CDMA */
+ g_object_set (s_cdma, NM_SETTING_CDMA_NUMBER, "#777", NULL);
+
+ nm_connection_add_setting (connection, nm_setting_ppp_new ());
+ } else {
+ /* user canceled; do nothing */
+ }
++#ifdef WITH_MBCA
++ } else { /* use_mbca */
++
++ assistant = list->mbca_assistant_new_func ();
++ g_signal_connect (G_OBJECT (assistant), "state-changed",
++ G_CALLBACK (mbca_assistant_state_changed_cb), list);
++ list->mbca_assistant_run_for_device_func (assistant,
++ MBCA_DEVICE_PSEUDO,
++ NULL, NULL);
++
++ mb_type = NM_TYPE_SETTING_GSM; /* get rid of compiler warning about
++ * unused variable */
++ }
++#endif /* WITH_MBCA */
+ } else if (ctype == NM_TYPE_SETTING_VPN) {
+ char *service = NULL;
+
+ service = vpn_ask_connection_type ();
+ if (service) {
+ NMSettingVPN *s_vpn;
+
+ id = get_next_available_name (list, _("VPN connection %d"));
+@@ -1313,16 +1504,20 @@
+ {
+ gtk_widget_hide (GTK_WIDGET (dialog));
+ }
+
+ static void
+ nm_connection_list_init (NMConnectionList *list)
+ {
+ list->treeviews = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
++
++#ifdef WITH_MBCA
++ list->mbca_module = NULL;
++#endif
+ }
+
+ static void
+ dispose (GObject *object)
+ {
+ NMConnectionList *list = NM_CONNECTION_LIST (object);
+
+ if (list->dialog)
+@@ -1352,16 +1547,21 @@
+ g_hash_table_destroy (list->treeviews);
+
+ if (list->gconf_settings)
+ g_object_unref (list->gconf_settings);
+
+ if (list->system_settings)
+ g_object_unref (list->system_settings);
+
++#if WITH_MBCA
++ if (list->mbca_module)
++ g_module_close (list->mbca_module);
++#endif
++
+ G_OBJECT_CLASS (nm_connection_list_parent_class)->dispose (object);
+ }
+
+ static void
+ nm_connection_list_class_init (NMConnectionListClass *klass)
+ {
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+Index: network-manager-applet-0.7.1~rc1+20090219+bzr974/src/connection-editor/nm-connection-list.h
+===================================================================
+--- network-manager-applet-0.7.1~rc1+20090219+bzr974.orig/src/connection-editor/nm-connection-list.h
++++ network-manager-applet-0.7.1~rc1+20090219+bzr974/src/connection-editor/nm-connection-list.h
+@@ -26,16 +26,20 @@
+ #include
+ #include
+ #include
+ #include
+ #include
+ #include
+ #include "nma-gconf-settings.h"
+
++#ifdef WITH_MBCA
++#include
++#endif
++
+ #define NM_TYPE_CONNECTION_LIST (nm_connection_list_get_type ())
+ #define NM_IS_CONNECTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CONNECTION_LIST))
+ #define NM_CONNECTION_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTION_LIST, NMConnectionList))
+
+ typedef struct {
+ GObject parent;
+
+ /* private data */
+@@ -50,16 +54,26 @@
+ GtkWidget *dialog;
+
+ GdkPixbuf *wired_icon;
+ GdkPixbuf *wireless_icon;
+ GdkPixbuf *wwan_icon;
+ GdkPixbuf *vpn_icon;
+ GdkPixbuf *unknown_icon;
+ GtkIconTheme *icon_theme;
++#ifdef WITH_MBCA
++ GModule *mbca_module;
++ MBCAAssistant* (*mbca_assistant_new_func) ();
++ gint (*mbca_assistant_run_for_device_func) (MBCAAssistant*,
++ MBCADeviceType,
++ const gchar*,
++ const gchar*);
++ MBCAConfiguration* (*mbca_assistant_get_configuration_func) (MBCAAssistant*);
++ void (*mbca_free_configuration_func) (MBCAConfiguration*);
++#endif
+ } NMConnectionList;
+
+ typedef struct {
+ GObjectClass parent_class;
+
+ /* Signals */
+ void (*done) (NMConnectionList *list, gint result);
+ } NMConnectionListClass;
+Index: network-manager-applet-0.7.1~rc1+20090219+bzr974/configure.ac
+===================================================================
+--- network-manager-applet-0.7.1~rc1+20090219+bzr974.orig/configure.ac
++++ network-manager-applet-0.7.1~rc1+20090219+bzr974/configure.ac
+@@ -210,16 +210,26 @@
+ unset has_option
+ unset SAVE_CFLAGS
+ done
+ unset option
+ else
+ AC_MSG_RESULT(no)
+ fi
+
++AC_ARG_WITH(mbca, AC_HELP_STRING([--with-mbca], [use Mobile Broadband Configuration Assistant]))
++
++if ! test -z "$with_mbca" ; then
++ CFLAGS="$CFLAGS -DWITH_MBCA"
++ PKG_CHECK_MODULES(MBCA, libmbca)
++ NMA_CFLAGS="$NMA_CFLAGS $MBCA_CFLAGS"
++ #NMA_LIBS="$NMA_LIBS $MBCA_LIBS"
++fi
++
++
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+ src/marshallers/Makefile
+ src/utils/Makefile
+ src/gconf-helpers/Makefile
+ src/wireless-security/Makefile
+ src/polkit-helpers/Makefile
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/20_use_full_vpn_dialog_service_name_path.patch
+++ network-manager-applet-0.7.1~rc3/debian/patches/20_use_full_vpn_dialog_service_name_path.patch
@@ -0,0 +1,64 @@
+
+We dont want LIBEXECDIR shuffeling. The vpn daemon building system knows
+better where the auth-dialog will be installed to; thus we just use the
+full path stored in VPN/*.name files.
+
+--
+
+=== modified file 'src/vpn-password-dialog.c'
+---
+ src/vpn-password-dialog.c | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+Index: ubuntu.0.7/src/vpn-password-dialog.c
+===================================================================
+--- ubuntu.0.7.orig/src/vpn-password-dialog.c
++++ ubuntu.0.7/src/vpn-password-dialog.c
+@@ -136,26 +136,16 @@
+ GTK_BUTTONS_CLOSE,
+ _("Cannot start VPN connection '%s'"),
+ name);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ _("Could not find the authentication dialog for VPN connection type '%s'. Contact your system administrator."),
+ service);
+ gtk_window_present (GTK_WINDOW (dialog));
+ g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
+- } else {
+- char *basename;
+-
+- /* Remove any path component, then reconstruct path to the auth
+- * dialog in LIBEXECDIR.
+- */
+- basename = g_path_get_basename (prog);
+- g_free (prog);
+- prog = g_strdup_printf ("%s/%s", LIBEXECDIR, basename);
+- g_free (basename);
+ }
+
+ return prog;
+ }
+
+ static void
+ destroy_gvalue (gpointer data)
+ {
+@@ -253,18 +243,18 @@
+ _("Cannot start VPN connection '%s'"),
+ id);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ _("There was a problem launching the authentication dialog for VPN connection type '%s'. Contact your system administrator."),
+ service_type);
+ gtk_window_present (GTK_WINDOW (dialog));
+ g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
+ g_set_error (&error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INTERNAL_ERROR,
+- "%s.%d (%s): couldn't run VPN auth dialog.",
+- __FILE__, __LINE__, __func__);
++ "%s.%d (%s): couldn't run VPN auth dialog. (cmd=%s)",
++ __FILE__, __LINE__, __func__, argv[0]);
+ goto out;
+ }
+
+ /* catch when child is reaped */
+ g_child_watch_add (child_pid, child_finished_cb, (gpointer) &child_status);
+
+ io_user_data.lines = NULL;
+ io_user_data.child_stdin = child_stdin;
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch
+++ network-manager-applet-0.7.1~rc3/debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch
@@ -0,0 +1,22 @@
+=== modified file 'nm-applet.desktop'
+---
+ nm-applet.desktop.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: ubuntu.0.7/nm-applet.desktop.in
+===================================================================
+--- ubuntu.0.7.orig/nm-applet.desktop.in
++++ ubuntu.0.7/nm-applet.desktop.in
+@@ -1,11 +1,12 @@
+ [Desktop Entry]
+ _Name=Network Manager
+ _Comment=Control your network connections
+ Icon=nm-device-wireless
+ Exec=nm-applet --sm-disable
+ Terminal=false
+ Type=Application
++OnlyShowIn=GNOME;XFCE;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=NetworkManager
+ X-GNOME-Bugzilla-Component=general
+ X-GNOME-Autostart-enabled=true
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/lp295788_xfce_menu_entry.patch
+++ network-manager-applet-0.7.1~rc3/debian/patches/lp295788_xfce_menu_entry.patch
@@ -0,0 +1,8 @@
+--- network-manager-applet-0.7.orig/nm-connection-editor.desktop.in 2009-01-13 14:42:59.000000000 -0500
++++ network-manager-applet-0.7/nm-connection-editor.desktop.in 2009-01-13 14:43:32.000000000 -0500
+@@ -9,4 +9,4 @@
+ X-GNOME-Bugzilla-Product=NetworkManager
+ X-GNOME-Bugzilla-Component=general
+ Categories=GNOME;GTK;Settings;X-SuSE-ControlCenter-System;X-GNOME-NetworkSettings;
+-OnlyShowIn=GNOME;
++OnlyShowIn=GNOME;Xfce;
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/lp289466_always_show_tray_icon.patch
+++ network-manager-applet-0.7.1~rc3/debian/patches/lp289466_always_show_tray_icon.patch
@@ -0,0 +1,65 @@
+=== modified file 'src/applet.c'
+---
+ src/applet.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: ubuntu.0.7/src/applet.c
+===================================================================
+--- ubuntu.0.7.orig/src/applet.c
++++ ubuntu.0.7/src/applet.c
+@@ -1719,16 +1719,18 @@
+ G_CALLBACK (foo_device_added_cb),
+ applet);
+ g_signal_connect (applet->nm_client, "notify::manager-running",
+ G_CALLBACK (foo_manager_running_cb),
+ applet);
+
+ if (nm_client_get_manager_running (applet->nm_client))
+ g_idle_add (foo_set_initial_state, applet);
++
++ applet_schedule_update_icon (applet);
+ }
+
+ static GdkPixbuf *
+ applet_common_get_device_icon (NMDeviceState state, NMApplet *applet)
+ {
+ GdkPixbuf *pixbuf = NULL;
+ int stage = -1;
+
+@@ -1825,16 +1827,18 @@
+ pixbuf = dclass->get_icon (device, state, connection, tip, applet);
+ if (!*tip)
+ *tip = get_tip_for_device_state (device, state, connection);
+ }
+
+ out:
+ if (!pixbuf)
+ pixbuf = applet_common_get_device_icon (state, applet);
++ if (!pixbuf)
++ pixbuf = applet->no_connection_icon;
+ return pixbuf;
+ }
+
+ static char *
+ get_tip_for_vpn (NMActiveConnection *active, NMVPNConnectionState state, NMApplet *applet)
+ {
+ NMConnectionScope scope;
+ char *tip = NULL;
+@@ -1893,17 +1897,16 @@
+ GString *tip;
+ NMVPNConnectionState vpn_state = NM_VPN_SERVICE_STATE_UNKNOWN;
+ gboolean nm_running;
+ NMActiveConnection *active_vpn = NULL;
+
+ applet->update_icon_id = 0;
+
+ nm_running = nm_client_get_manager_running (applet->nm_client);
+- gtk_status_icon_set_visible (applet->status_icon, nm_running);
+
+ /* Handle device state first */
+
+ state = nm_client_get_state (applet->nm_client);
+ if (!nm_running)
+ state = NM_STATE_UNKNOWN;
+
+ switch (state) {
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/lp337960_dxteam_notification_icon_names_part2-images.diff
+++ network-manager-applet-0.7.1~rc3/debian/patches/lp337960_dxteam_notification_icon_names_part2-images.diff
@@ -0,0 +1,1860 @@
+=== modified file 'icons/scalable/Makefile.am'
+--- old/icons/scalable/Makefile.am 2009-02-17 16:32:22 +0000
++++ new/icons/scalable/Makefile.am 2009-03-04 22:05:26 +0000
+@@ -1,7 +1,10 @@
+ icondir=${datadir}/icons/hicolor/scalable/apps
+ icon_DATA = \
+ nm-device-wired.svg \
+- nm-no-connection.svg
++ nm-no-connection.svg \
++ notification-gsm-high.svg \
++ notification-network-ethernet-connected.svg \
++ notification-network-wireless-full.svg
+
+ EXTRA_DIST = $(icon_DATA)
+
+
+=== added file 'icons/scalable/notification-gsm-high.svg'
+--- old/icons/scalable/notification-gsm-high.svg 1970-01-01 00:00:00 +0000
++++ new/icons/scalable/notification-gsm-high.svg 2009-03-04 22:02:18 +0000
+@@ -0,0 +1,771 @@
++
++
++
+\ No newline at end of file
+
+=== added file 'icons/scalable/notification-network-ethernet-connected.svg'
+--- old/icons/scalable/notification-network-ethernet-connected.svg 1970-01-01 00:00:00 +0000
++++ new/icons/scalable/notification-network-ethernet-connected.svg 2009-03-04 22:01:48 +0000
+@@ -0,0 +1,1015 @@
++
++
++
++
+
+=== added file 'icons/scalable/notification-network-wireless-full.svg'
+--- old/icons/scalable/notification-network-wireless-full.svg 1970-01-01 00:00:00 +0000
++++ new/icons/scalable/notification-network-wireless-full.svg 2009-03-04 21:54:28 +0000
+@@ -0,0 +1,41 @@
++
++
++
+\ No newline at end of file
+
--- network-manager-applet-0.7.1~rc3.orig/debian/patches/lp330608_dxteam_gsm_connect_text.patch
+++ network-manager-applet-0.7.1~rc3/debian/patches/lp330608_dxteam_gsm_connect_text.patch
@@ -0,0 +1,33 @@
+=== modified file 'src/applet-device-gsm.c'
+--- a/src/applet-device-gsm.c 2009-02-17 16:32:22 +0000
++++ b/src/applet-device-gsm.c 2009-02-17 16:36:47 +0000
+@@ -287,24 +287,19 @@
+ if (new_state == NM_DEVICE_STATE_ACTIVATED) {
+ NMConnection *connection;
+ NMSettingConnection *s_con = NULL;
+- char *str = NULL;
++ const char *str = NULL;
+
+ 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));
+- id = s_con ? nm_setting_connection_get_id (s_con) : NULL;
+- if (id)
+- str = g_strdup_printf (_("You are now connected to '%s'."), id);
++ str = s_con ? nm_setting_connection_get_id (s_con) : NULL;
+ }
+
+ applet_do_notify_with_pref (applet,
+- _("Connection Established"),
+- str ? str : _("You are now connected to the GSM network."),
++ str ? str : _("GSM network."),
++ _("Connection established"),
+ "nm-device-wwan",
+ PREF_DISABLE_CONNECTED_NOTIFICATIONS);
+- g_free (str);
+ }
+ }
+
+