--- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/aclocal.m4 +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/aclocal.m4 @@ -0,0 +1 @@ +# empty file --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/rules +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/rules @@ -0,0 +1,111 @@ +#!/usr/bin/make -f + +DEB_SOURCE := $(shell dpkg-parsechangelog | grep Source: | sed -e 's/Source: //') +DEB_VERSION := $(shell dpkg-parsechangelog | grep Version: | sed -e 's/Version: //') +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/-[^-]*$$//') +DEB_MAJOR_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e 's/git.*//') + +DEB_AUTO_UPDATE_LIBTOOL = pre +DEB_AUTO_UPDATE_AUTOHEADER = 2.50 +DEB_AUTO_UPDATE_ACLOCAL = 1.11 +DEB_AUTO_UPDATE_AUTOMAKE = 1.11 -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 \ + --enable-indicator \ + $(NULL) + +GIT_URL := git://git.gnome.org/network-manager-applet +GIT_BRANCH := "NMA_0_8" +GIT_BRANCH_NAME := network-manager-applet + +ifneq (,$(LOCAL_BRANCH)) +LOCAL_REAL_BRANCH = $(realpath $(LOCAL_BRANCH)) +endif + +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/ + # workaround for icon-changes + # dapper -> intrepid (?) + 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 + # karmic -> lucid + cp -f debian/icons/22/nm-active-device.png \ + debian/network-manager-gnome/usr/share/icons/hicolor/22x22/apps/ + +common-binary-post-install-arch:: + find debian/network-manager-gnome/ -name \*.la -o -name \*.a | xargs rm > /dev/null || true + +clean:: + rm -f po/*.gmo + rm -f debian/*.1 + rm -f gtk-doc.make + echo "# empty file" > aclocal.m4 + rm -f debian/icons/22/*.png + +pre-build:: + intltoolize -f -c + set -e; cd debian/icons/22/; uudecode nm-secure-lock.png.uue + set -e; cd debian/icons/22/; uudecode nm-active-device.png.uue + cp -rf $(CURDIR)/debian/icons/22 icons/ + +GET_SOURCE = \ + set -e; \ + tmpdir=`mktemp -d -t`; \ + cd $$tmpdir; \ + echo "cloning upstream repository ..."; \ + git clone -b $(GIT_BRANCH) $(if $(LOCAL_BRANCH),$(call LOCAL_REAL_BRANCH)/$(GIT_BRANCH_NAME),$(GIT_URL)) $(GIT_BRANCH_NAME); \ + echo "getting specific upstream revision/tag: $(1)"; \ + cd `ls | head -n 1`; git checkout -b orig $(1); \ + commit_id=`git log -n1 --abbrev-commit | grep '^commit ' | sed -e 's/commit //' | sed -e 's/\.\.\.$$//'`; \ + raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y%m%dt%H%M%S"`; \ + if echo $(1) | grep -q -c "orig" || echo $(DEB_VERSION) | grep -q -c "git"; \ + then \ + upstream_version=$(DEB_MAJOR_VERSION)git.$$raw.$$commit_id; \ + else \ + upstream_version=$(DEB_UPSTREAM_VERSION); \ + fi; \ + cd ..; tar --exclude=.git -czf $(CURDIR)/$(DEB_SOURCE)_$$upstream_version.orig.tar.gz `ls | head -n 1`; \ + cd $(CURDIR); rm -rf $$tmpdir; + +get-current-source:: $(if $(LOCAL_BRANCH),update-local-branch) + set -e; if echo $(DEB_VERSION) | grep -q -c "git"; \ + then \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \ + elif echo $(DEB_VERSION) | grep -q -c "~rc"; \ + then \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^\([0-9\.]*\)\(~rc\)\([0-9]\)-.*$$/\1-rc\3/'`; \ + else \ + git_version=$(DEB_UPSTREAM_VERSION); \ + fi; \ + $(call GET_SOURCE, $$git_version, "current") + +get-orig-source:: $(if $(LOCAL_BRANCH),update-local-branch) + $(call GET_SOURCE, "HEAD", "orig") + +update-local-branch:: + @echo "updating local branch ($(LOCAL_BRANCH))" + @set -e; if ! test -d $(LOCAL_BRANCH); then mkdir -p $(LOCAL_BRANCH); fi + @set -e; if ! test -d $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); then git clone $(GIT_URL) $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); fi + @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); if ! `git branch | grep -q -c "$(GIT_BRANCH)"`; then git branch $(GIT_BRANCH) remotes/origin/$(GIT_BRANCH); fi + @set -e; cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); git checkout $(GIT_BRANCH); git pull -f + @echo "updated local branch ($(LOCAL_BRANCH))" + +get-snapshot-info:: $(if $(LOCAL_BRANCH),update-local-branch) + @set -e; \ + git_version=`echo $(DEB_VERSION) | sed -e 's/^.*git\.*\([0-9t]*\)\.\(.*\)-.*$$/\2/g'`; \ + cd $(LOCAL_BRANCH)/$(GIT_BRANCH_NAME); \ + raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc $$git_version | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y-%m-%d %H:%M:%S (GMT)"`; \ + git log -n1 $$git_version --format="%n%s%n%n * upstream snapshot $$raw%n + %H%n"; --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/copyright +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/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.8.3+git.20110114t131931.fd589a7.orig/debian/compat +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/compat @@ -0,0 +1 @@ +5 --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/changelog +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/changelog @@ -0,0 +1,944 @@ +network-manager-applet (0.8.3+git.20110114t131931.fd589a7-0ubuntu2) natty; urgency=low + + * debian/patches/nm-applet-use-indicator.patch: Fix memory leak in + escape_mnemonics(). + + -- Anders Kaseorg Wed, 19 Jan 2011 15:29:52 -0500 + +network-manager-applet (0.8.3+git.20110114t131931.fd589a7-0ubuntu1) natty; urgency=low + + * upstream snapshot 2011-01-14 13:19:31 (GMT) + + fd589a743f2484dd19495951cb1d498b8902ff4b + - applet: show IPv6 stuff in Connection information window + - mobile-wizard: use "Country or region" term (bgo #618511) + * Collapse the Enable networking, wireless, mobile broadband into just one + menu item (Flight mode), which toggles all radio-based systems (everything + but wired). + * Clean up some of the separations by removing the "Available" items, + turning it into a plain separator. + * Do some further rework of the indicator patch: dispatch menu rebuilds only + when no other events are happening, which should reduce the number of + spurious errors messages in .xsession-errors. + * Drop the patch for fixing races in getting enable/disable permissions; it's + been upstream for a long while (was a backport). + - deleted debian/patches/lp637930_fix_race_in_permissions-changed.patch + * Fix an uninitialized variable in the new code to show IPv6 address info in + the Connection Information dialog. + - added debian/patches/applet-dialog-uninited-method.patch + - updated debian/patches/series + + -- Mathieu Trudel-Lapierre Mon, 17 Jan 2011 14:53:13 -0500 + +network-manager-applet (0.8.3+git.20101209t081952.0330eca-0ubuntu3) natty; urgency=low + + * Re-instate animations while processing network association phases, it tends + to be annoying and confusing without them. (LP: #694534) + * Provide and use premade theme icons for wireless strength *with security*, + which include the padlock already composited. + - Enable icons in menus for wireless strength and security. (LP: #683896) + - Re-use the same icons to notify the user that they are connected to a + VPN-secured connection. (LP: #696442) + * Clean up code paths for GSM and CDMA devices which still tried to create + a custom widget to add to the menu -- replaced it with a simple image + menu item. + * Escape underscores in SSID names so they display with the correct name + rather than underlining the next character (as a mnemonic). + + -- Mathieu Trudel-Lapierre Fri, 07 Jan 2011 12:52:06 -0500 + +network-manager-applet (0.8.3+git.20101209t081952.0330eca-0ubuntu2) natty; urgency=low + + * Update indicator patch to not re-create the menu on a device-added signal, + only on state-changed (which gets called anyway). This should fix the crash + for GSM/CDMA devices when they are plugged in as nm-applet starts. + (LP: #692234) + - update debian/patches/nm-applet-use-indicator.patch + + -- Mathieu Trudel-Lapierre Mon, 20 Dec 2010 14:51:52 -0500 + +network-manager-applet (0.8.3+git.20101209t081952.0330eca-0ubuntu1) natty; urgency=low + + * upstream snapshot 2010-12-09 08:19:52 (GMT) + + 0330ecae2eec0d4dfccd57921f1992b8e245e2da + - core: convert to GtkBuilder (bgo #625248) + - when no VPN plugin is installed, indicate that in the tooltip of "Add" button + * Refresh notifications update patch, which needed some rework due to upstream + libnotify >= 0.7 fixes. + - update debian/patches/lp460144_correctly_update_notification.patch + * Rip out some more GtkImageMenuItems from the indicator menus, since they tend + to cause spewage of Glib/Gtk errors on .xsession-errors. They do not show on + a default install anyway. Also refresh the patch for libnotify changes. + - update debian/patches/nm-applet-use-indicator.patch + * Switch from regularly updating the menus to doing it "on-demand", by following + the signals sent from NetworkManager on device state changes. + - update debian/patches/nm-applet-use-indicator.patch + * More changes to indicator patch for making sure allocated memory gets freed. + - update debian/patches/nm-applet-use-indicator.patch + + -- Mathieu Trudel-Lapierre Fri, 10 Dec 2010 17:51:44 -0500 + +network-manager-applet (0.8.2+git.20101123t161608.f143e76-0ubuntu1) natty; urgency=low + + * upstream snapshot 2010-11-23 16:16:08 (GMT) + + f143e7629749acdb20de072372fbd471ec2c19a8 + * Refreshed debian/patches/lp295788_xfce_menu_entry.patch + * Refreshed debian/patches/lp337960_dxteam_notification_icon_names.diff + * Refreshed debian/patches/lp341684_device_sensitive_disconnect_notify.patch + * more workflow updates to get the daily builds to work with different branches + - update debian/rules + * Now draw the applet and applet's menus using libappindicator. + - add debian/patches/nm-applet-use-indicator.patch + - update debian/patches/series + * Explicitly turn on libappindicator support with --enable-indicator. + - update debian/rules + * Add Build-Depends for libappindicator-dev + - update debian/control + + -- Mathieu Trudel-Lapierre Mon, 29 Nov 2010 10:38:51 -0500 + +network-manager-applet (0.8.1+git.20100809t190028.290dc70-0ubuntu3) maverick; urgency=low + + * Cherry-pick upstream commit c7b5312 to fix greyed-out Enable Networking items in + context menu (LP: #637930) + - added debian/patches/lp637930_fix_race_in_permissions-changed.patch + - modified debian/patches/series + + -- Mathieu Trudel-Lapierre Thu, 16 Sep 2010 10:23:15 -0400 + +network-manager-applet (0.8.1+git.20100809t190028.290dc70-0ubuntu2) maverick; urgency=low + + * Bump Build-Depends for network-manager-dev, libnm-glib-dev, libnm-util-dev + to be >= 0.8.1. + - update debian/control + + -- Mathieu Trudel-Lapierre Wed, 11 Aug 2010 10:48:13 -0400 + +network-manager-applet (0.8.1+git.20100809t190028.290dc70-0ubuntu1) maverick; urgency=low + + * upstream snapshot 2010-08-09 19:00:28 (GMT) + + 290dc707f2076135eac02ed2d975912cb1ae80ce + * update debian/rules: + - switch GIT_BRANCH to NMA_0_8, be conservative: only track 0.8.1 for now. + - update get-orig-source/branch code to properly deal with branch switch. + * refresh the device disconnection notification patch, update to new code base + - updated debian/patches/lp341684_device_sensitive_disconnect_notify.patch + * refreshed vpn service name patch, update to new code base + - updated debian/patches/20_use_full_vpn_dialog_service_name_path.patch + * delete lazy icon loading patch from seb128, it's applied upstream + - deleted debian/patches/bgo609134_lazy_icons.patch + - updated debian/patches/series + * delete lazy notification capabilities checking from pitti: applied upstream + - deleted debian/patches/bgo610881_lazy_init_notify_caps.patch + - updated debian/patches/series + * bump DEB_AUTO_UPDATE_ACLOCAL and DEB_AUTO_UPDATE_AUTOMAKE to 1.11 + - update debian/rules + * refreshed the patch to always show the tray icon + - update debian/patches/lp289466_always_show_tray_icon.patch + + -- Mathieu Trudel-Lapierre Wed, 11 Aug 2010 10:09:37 -0400 + +network-manager-applet (0.8-0ubuntu3) lucid; urgency=low + + [ Mirco Müller (MacSlow) ] + * Make nm-applet correctly update a notification, if the connection-status + has changed. This avoids displaying obsolete notifications to the user, + which no longer reflect the correct connection-status. Fixes LP: #460144 + - add debian/patches/lp460144_correctly_update_notification.patch + - update debian/patches/series + + [ Chris Coulson Tue, 30 Mar 2010 10:39:18 +0200 + +network-manager-applet (0.8-0ubuntu2) lucid; urgency=low + + * Add bgo610881_lazy_init_notify_caps.patch: Defer querying notification + server capabilities until needed, to avoid starting notify-osd on desktop + startup. + + -- Martin Pitt Tue, 23 Feb 2010 23:22:23 +0100 + +network-manager-applet (0.8-0ubuntu1) lucid; urgency=low + + [ Tony Espy ] + * drop string change revert_* patches, as full SRU for Karmic + was rejected. + - remove debian/patches/revert_more_networks.patch + - remove debian/patches/revert_disable_notifications.patch + - remove debian/patches/revert_country_not_listed.patch + - remove debian/patches/revert_cleartext_priv_keys.patch + - remove debian/patches/revert_enable_broadband.patch + - update debian/series + + [ Mathieu Trudel ] + * upstream release 0.8 + - core: add --help to explain what nm-applet is/does (rh #494641) + - core: clearer failure message when an applet is already running + - wired: don't crash when getting 802.1x settings from the user (rh #556763) + - info: don't crash on various D-Bus property errors (rh #557007) + - core: fix clearing secrets when updating connections + - build: link nm-connection-editor with libm for ceil() (rh #541353) + - gsm: fix secret requests when connection has multiple secrets + * bump build-depends to >= 0.8 to build with 0.8 final. + - update debian/control + + [ Michael Vogt ] + * debian/rules, debian/icons/22/nm-active-device.png.uue: + - install icon so that on upgrade the old applet can + still find it and not error out (LP: #518760) + + [ Sebastien Bacher ] + * lazily load icons for using less cpu on login + - add debian/patches/bgo609134_lazy_icons.patch + - update debian/patches/series + + -- Mathieu Trudel Fri, 19 Feb 2010 08:34:28 -0500 + +network-manager-applet (0.8~rc2-0ubuntu1) lucid; urgency=low + + * upstream snapshot 2009-11-12 07:27:27 (GMT) + + 4162285fd7c53e8b684e1c1513a2ba6ce865e073 + + * upstream 0.8-rc1 release + - applet: don't crash if we can't get some ActiveConnection attrs (rh: #545011) + - editor: serialize PolicyKit auth requests (rh #462944) (LP: #462944) + - applet: don't crash if wireless dialog goes away quickly (rh #542617) + - eap: handle PEM files without and ending newline (rh #507315) + - tls: require password-protected private keys + - applet: fix connecting to system connections from wireless dialog + - menu: show BT connections when no other devices available (rh #532049) + - applet: don't assert when auto connections can't be made (rh #532680) + - editor: fix various IP page tooltips (bgo #595287) + - applet: fix animation issues + - mobile-wizard: add a "My Country is not listed" option (rh #530981) (bgo #599705) + - applet: fix issues with icon loading when panel is slow to resize (rh #529766) + - applet: Connect to Hidden doesn't work for non-New networks (LP: #446394) + - applet: nm-applet does not start at login (LP: #146896) + + * upstream 0.8-rc2 release + - editor: protect against invalid CEPolkitButton objects (rh #549579) + - menu: ensure active menu item is valid before trying to use it (rh #546901) + - editor: fix bad assignment + - core: add "Enable Mobile Broadband" menu item + - applet: escape notification text + + + [ Mathieu Trudel ] + * updated device sensitive disconnect notification patch + - update debian/patches/lp341684_device_sensitive_disconnect_notify.patch + + [ Tony Espy ] + * add logic to map '~rc' versions to '-rc' tag format used upstream. This + allows the upstream tags to be used, while managing to keep the version + numbers less than the final release version. + - update debian/rules + * update build and runtime depends for network-manager to >= 0.8~rc2 + - update debian/control + * backout string changes in preparation for SRU + - add deb/debian/patches/revert_more_networks.patch + - add deb/debian/patches/revert_disable_notifications.patch + - add deb/debian/patches/revert_country_not_listed.patch + - add deb/debian/patches/revert_cleartext_priv_keys.patch + - add deb/debian/patches/revert_enable_broadband.patch + - update debian/series + + -- Tony Espy Wed, 20 Jan 2010 10:16:56 -0500 + +network-manager-applet (0.8~a~git.20091014t134532.4033e62-0ubuntu1) karmic; urgency=low + + * upstream snapshot for karmic-RC 2009-10-14 13:45:32 (GMT) + + 4033e623f7af571d38281f5fb6ab28a77bfe2220 + - core: don't crash if we can't get active connection properties from NM (LP: #430535) + - gconf: restore 0.7 notification behavior defaults (LP: #444561) + + -- Alexander Sack Thu, 15 Oct 2009 00:34:03 +0200 + +network-manager-applet (0.8~a~git.20091002t194214.8515a07-0ubuntu1) karmic; urgency=low + + * upstream snapshot 2009-10-02 19:42:14 (GMT) + + 8515a07e507847c4372fe8f95bddf57aea66acd5 + * fixed upstream + - LP: #285219 - Critical warning while running nm-connection-editor + - LP: #442988 - network manager mobile broadband does not remember username + and password + - LP: #439956 - Cannot set manual IP and DNS with nm-connection-editor + - LP: #438160 - nm-applet loses ipv4 configuration + - LP: #431265 - Network Manager can't connect to hidden wireless networks + - LP: #443049 - MASTER nm-connection-editor crashed with SIGSEGV in get_permissions_cb + - LP: #438374 - Failure to retain edited MTU value + - LP: #436839 - Disconnect menu option looks like wireless network + + [ Tony Espy ] + * drop wifi toplevel_sort patch that was committed upstream + - delete debian/patches/wifi_toplevel_ap_sort.patch + - update debian/patches/series + + [ Alexander Sack ] + * drop preview patch that was committed upstream + - delete debian/patches/nm08-applet-preview.patch + - update debian/patches/series + * require network-manager and libnm-* >= 0.8~a~git.20090930t162132 + - update debian/control + * adjust patches to new upstream code base + - update debian/patches/lp341684_device_sensitive_disconnect_notify.patch + * (re-)sort wifi toplevel AP list alphabetically before adding to menu + - add debian/patches/toplevel_sort.patch + - update debian/patches/series + * rebuild against latest NM after padding additions to libnm-* APIs + - update debian/control + + -- Alexander Sack Mon, 05 Oct 2009 23:45:07 +0200 + +network-manager-applet (0.8~a~git.20090923t220421.1ac8ffd-0ubuntu4) karmic; urgency=low + + * LP: #436061 - fix nm-applet crash when no APs in proximity; drop assert on a GList, which + explicitly can be NULL. + - update debian/patches/nm08-applet-preview.patch + * LP: #436179 - nm-applet assert failure: ERROR:applet.c:481:applet_menu_item_favorize_helper: + assertion failed: (favoritePixbuf); simply return with warning if favorize helper is invoked + without a favorite pixbuf + - update debian/patches/nm08-applet-preview.patch + * important UI tweaks for karmic beta: 1. don't use an icon to indicate favorites/known + connections - the heart was just too ugly; 2. dont put "Active" separator above the + current active connection; in turn we make the current AP bold; 3. increase xpadding for + title items (e.g. Wireless Networks) to 10.0; 4. do not visualize all visible connections + as active if a device is disconnected. + - update debian/patches/nm08-applet-preview.patch + + -- Alexander Sack Fri, 25 Sep 2009 10:08:46 +0200 + +network-manager-applet (0.8~a~git.20090923t220421.1ac8ffd-0ubuntu3) karmic; urgency=low + + * fix build failure because of compiler warnings due to uninitialized variable + - update debian/patches/nm08-applet-preview.patch + + -- Alexander Sack Thu, 24 Sep 2009 17:40:06 +0200 + +network-manager-applet (0.8~a~git.20090923t220421.1ac8ffd-0ubuntu2) karmic; urgency=low + + * fix build failure caused by missing build-depend for uudecode + - update debian/control + + -- Alexander Sack Thu, 24 Sep 2009 17:16:54 +0200 + +network-manager-applet (0.8~a~git.20090923t220421.1ac8ffd-0ubuntu1) karmic; urgency=low + + * upstream snapshot 2009-09-23 22:04:21 (GMT) + + 1ac8ffd41a2d162d23713415cec6c3e96fbc3c82 + + new upstream UI for beta (prepatched) - LP: #435333 + + mini-abi transition respin for libnm-glib-vpn rename fixes LP: #435888 + + [ Alexander Sack ] + * increase build-depend version requirements for network-manager bits to + latest upstream (>= 0.8~a~git.20090923t064445) + - update debian/control + * add new nm08 applet prepatch and add icons not shippable in diff manually + using uudecode + - add debian/patches/nm08-applet-preview.patch + - update debian/patches/series + - add debian/icons/22/nm-secure-lock.png.uue + - update debian/rules + + [ Mathieu Trudel ] + * fix noisy output: use grep -q -c rather than just -c in GET_SOURCE etc. + - update debian/rules + * add get-snapshot-info rule + - update debian/rules + * make GET_SOURCE not go mad for git versions that use a different abbrev-id syntax + - update debian/rules + * drop ellipsize patch, addressed libhal issues, superseded by the use of udev + - delete debian/patches/lp341940_use_ellipsized_menu_entries.patch + - update debian/patches/series + + -- Alexander Sack Thu, 24 Sep 2009 15:30:33 +0200 + +network-manager-applet (0.8~a~git.20090913t161448.cc2f6be-0ubuntu1) karmic; urgency=low + + * upstream snapshot 2009-09-13 16:14:48 (GMT) + + cc2f6bea12daec5f0caf535a3534f07ade5b5cf2 + + [ Alexander Sack ] + * build depend on libpolkit-gobject-1-dev instead of libpolkit-dbus-dev + - update debian/control + + [ Tony Espy ] + * adjust patches for upstream code base + - update debian/patches/20_use_full_vpn_dialog_service_name_path.patch + - update debian/patches/lp328572_dxteam_connect_text.patch + - update debian/patches/lp337960_dxteam_notification_icon_names.diff + - update debian/patches/lp341684_device_sensitive_disconnect_notify.patch + * adjust build and runtime depends due to ABI changes in latest NM + - update debian/control + + -- Alexander Sack Mon, 14 Sep 2009 11:32:57 +0200 + +network-manager-applet (0.8~a~git.20090818t151413.a8b7eed-0ubuntu2) karmic; urgency=low + + * fix lpia build problems; make find and remove of .a .la files more robust + in common-binary-post-install-arch:: target + - update debian/rules + + -- Alexander Sack Fri, 21 Aug 2009 10:32:12 +0200 + +network-manager-applet (0.8~a~git.20090818t151413.a8b7eed-0ubuntu1) karmic; urgency=low + + [ Tony Espy ] + * upstream snapshot 2009-08-18 15:14:13 (GMT) + + a8b7eed3676e1154b4df1b3292eb414a3e9f2378 + - includes WEP Auth dialog simplification and + minor IPv6 changes + + [ Alexander Sack ] + * add LOCAL_BRANCH feature to play nicely with fta's build bot + - update rules + * add gnome-bluetooth support; build-depend on libgnome-bluetooth-dev and install + the gnome-bluetooth plugin to the gnome-bluetooth plugindir directory. + - update debian/control + * remove bluetooth plugin .la and .la files during post-install + - update debian/rules + + -- Tony Espy Thu, 20 Aug 2009 11:48:20 -0400 + +network-manager-applet (0.8~a~git.20090805t131328.d1edfce-0ubuntu1) karmic; urgency=low + + [ Tony Espy ] + * upstream snapshot 2009-08-05 13:13:28 (GMT) + + d1edfced3ac4373019c097a4de5c7b97d0b2562a + * bump required version for networkmanager bits to >= 0.8~a~git.20090804t185522 + - update control + * adjust patch for upstream code base + - update patches/lp341684_device_sensitive_disconnect_notify.patch + * re-work tarball generation code; added get-curr-source to + grab a specific version; get-orig-source now grabs the tip + of new variable GIT_BRANCH; adjusted changelog version to + new scheme. + - update rules + + [ Alexander Sack ] + * prepare get-orig-source for daily ppa-scripts + - update rules + * adjust patches to changed upstream codebase + - update patches/lp341940_use_ellipsized_menu_entries.patch + * raise build requirements on network-manager parts to >= 0.8~ + - update control + + -- Tony Espy Thu, 06 Aug 2009 10:35:38 +0100 + +network-manager-applet (0.7.1.git.2.8ed7940cd3-0ubuntu1~nm1) UNRELEASED; urgency=low + + * upstream snapshot 2009-07-01 18:21:51 (GMT) + + commit 8ed7940cd3eb2158f95786e4a0cfbeea2035a870 + * bump required version for networkmanager bits to >= 0.7.1.git.1 + * drop mbca patch because upstream ships its own wizard now + - delete patches/add_libmbca_support.patch + - update patches/series + * drop libmbca-dev from build-depends as nm applet builds its own wizard + now; in turn depend binary package on mobile-broadband-provider-info >= 20090622 + - update control + * adjust patches to changed upstream code base + - update patches/lp341940_use_ellipsized_menu_entries.patch + - update patches/lp337960_dxteam_notification_icon_names.diff + - update patches/lp341684_device_sensitive_disconnect_notify.patch + * drop libmbca0 from Recommends + - update control + + -- Alexander Sack Tue, 02 Jun 2009 14:14:43 +0200 + +network-manager-applet (0.7.1-0ubuntu1) karmic; urgency=low + + * Upstream release 0.7.1 + * drop patches applied upstream + - delete patches/fix_upstream_buildfailure.patch + - update patches/series + * adjust patches to new upstream code base + - update patches/lp341940_use_ellipsized_menu_entries.patch + * fix LP: #341940 - menu entries like device names can be overly long; + we fix this by using ellipsized labels with proper tooltip to allow + interested users to read the full text label + - add patches/lp341940_use_ellipsized_menu_entries.patch + - update patches/series + + -- Alexander Sack Tue, 02 Jun 2009 13:20:07 +0200 + +network-manager-applet (0.7.1~rc4.1-0ubuntu2) jaunty; urgency=low + + * point Vcs-Bzr header to proper branch + - update control + * fix LP: #358526 - Notification shows wrong WiFi disconnected icon when + resuming from suspend; we use the proper generic disconnected icon + if we don't know which device type caused the "offline" event. + - add patches/lp358526_generic_disconnected_notification_icon.patch + - update patches/series + + -- Alexander Sack Tue, 14 Apr 2009 12:52:44 +0200 + +network-manager-applet (0.7.1~rc4.1-0ubuntu1) jaunty; urgency=low + + * New upstream release 0.7.1 rc4 + + svn-v3-trunk0:9c6bbc85-7128-0410-879a-9bbc9e4270e9:branches%2FNETWORKMANAGER_APPLET_0_7:1254 + + drop upstreamed patches + - delete patches/lp331799_sensible_notify_actions.patch + - update patches/series + + adjust diverged patches to new upstream codebase + - update patches/add_libmbca_support.patch + - update patches/lp341684_device_sensitive_disconnect_notify.patch + + fix build failure with our gcc introduced upstream (string format issue) + - add patches/fix_upstream_buildfailure.patch + - update patches/series + * rename patch for disconnect states to match the bug it fixed (LP: #341684) + - rename patches/lpXXX_device_sensitive_disconnect_notify.patch => + lp341684_device_sensitive_disconnect_notify.patch + - update patche/series + * fix LP: #348612 - Wired disconnect icon is wrong; we fix a typo in icon name + - update patches/lp341684_device_sensitive_disconnect_notify.patch + * fix LP: #354420 - offline notification should have NOTIFY_URGENCY_CRITICAL; + normal disconnect notifications get NOTIFY_URGENCY_NORMAL + - update patches/lp341684_device_sensitive_disconnect_notify.patch + * eliminate string changes from a few notification patches + - update patches/lp330571_dxteam_wired_connect_text.patch + - update patches/lp330608_dxteam_gsm_connect_text.patch + and adjust follow up patches + - update patches/lp337960_dxteam_notification_icon_names.diff + + -- Alexander Sack Mon, 06 Apr 2009 13:25:39 +0200 + +network-manager-applet (0.7.1~rc3-0ubuntu4) jaunty; urgency=low + + * use the notification-gsm-disconnected icon name used by human theme for jaunty beta + - update patches/lpXXX_device_sensitive_disconnect_notify.patch + + -- Alexander Sack Thu, 19 Mar 2009 17:02:01 +0100 + +network-manager-applet (0.7.1~rc3-0ubuntu3) jaunty; urgency=low + + * fix bug in lpXXX_device_sensitive_disconnect_notify.patch that made + disconnect events to not display a notification if the overall state + still was online + - update patches/lpXXX_device_sensitive_disconnect_notify.patch + + -- Alexander Sack Thu, 19 Mar 2009 15:44:43 +0100 + +network-manager-applet (0.7.1~rc3-0ubuntu2) jaunty; urgency=low + + * flip title in wifi "Connection Established" notification bubble (LP: #338389) + - update patches/lp328572-dxteam-connect-text.patch + - update patches/lp337960_dxteam_notification_icon_names.diff + * add patch to support device sensitive disconnect/offline notifications; + this patch queues event from NMClient and NMDevice and then decides what + kind of disconnect happened and which device was reponsible. + - add patches/lpXXX_device_sensitive_disconnect_notify.patch + - update patches/series + + -- Alexander Sack Thu, 19 Mar 2009 14:54:03 +0100 + +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.8.3+git.20110114t131931.fd589a7.orig/debian/nm-applet.sgml +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/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.8.3+git.20110114t131931.fd589a7.orig/debian/control +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/control @@ -0,0 +1,56 @@ +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.8.1), + libnm-util-dev (>= 0.8.1), + libnm-glib-dev (>= 0.8.1), + libiw-dev, + libxml-parser-perl, + docbook-to-man, + quilt, + libnotify-dev, + gnome-common, + libnss3-dev, + libpolkit-gobject-1-dev, + intltool, + libgnome-bluetooth-dev, + libappindicator-dev, + sharutils +Standards-Version: 3.7.2 +Vcs-Bzr: https://code.launchpad.net/~network-manager/network-manager-applet/ubuntu.head + +Package: network-manager-gnome +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + network-manager (>= 0.8~rc2), + gksu, + mobile-broadband-provider-info (>= 20090622) +Recommends: notification-daemon +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.8.3+git.20110114t131931.fd589a7.orig/debian/network-manager-applet.manpages +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/network-manager-applet.manpages @@ -0,0 +1 @@ +debian/nm-applet.1 --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/14_lp123808_dont_start_applet_on_ltsp_client.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/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.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp268803_xdg_autostart_gnome_xfce_only.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/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.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp330571_dxteam_wired_connect_text.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/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.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp341684_device_sensitive_disconnect_notify.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/lp341684_device_sensitive_disconnect_notify.patch @@ -0,0 +1,215 @@ +=== modified file 'src/applet-device-wifi.c' +--- + src/applet-device-wifi.c | 4 + + src/applet.c | 136 +++++++++++++++++++++++++++++++++++++++++++++-- + src/applet.h | 3 + + 3 files changed, 138 insertions(+), 5 deletions(-) + +Index: network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet-device-wifi.c +=================================================================== +--- network-manager-applet-0.8.2+git.20101123t161608.f143e76.orig/src/applet-device-wifi.c 2010-11-26 13:50:08.433452112 -0500 ++++ network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet-device-wifi.c 2010-11-26 13:50:08.503452112 -0500 +@@ -1250,8 +1250,10 @@ + if (new) { + const GByteArray *ssid = nm_access_point_get_ssid (new); + +- if (ssid) ++ if (ssid) { + esc_ssid = nm_utils_ssid_to_utf8 ((const char *) ssid->data, ssid->len); ++ g_object_set_data_full (G_OBJECT(device), "canonical-last-essid", g_strdup (esc_ssid), (GDestroyNotify) g_free); ++ } + + /* Save this BSSID to seen-bssids list */ + connection = applet_get_exported_connection_for_device (device, applet); +Index: network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet.c +=================================================================== +--- network-manager-applet-0.8.2+git.20101123t161608.f143e76.orig/src/applet.c 2010-11-26 13:50:08.283452112 -0500 ++++ network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet.c 2010-11-26 13:53:49.823452112 -0500 +@@ -40,6 +40,7 @@ + #include + + #include ++#include + #include + #include + #include +@@ -74,6 +75,19 @@ + + G_DEFINE_TYPE(NMApplet, nma, G_TYPE_OBJECT) + ++struct _OfflineNotificationContextInfo { ++ NMState state; ++ NMDeviceState device_state; ++ NMDeviceStateReason device_state_reason; ++ NMDeviceType device_type; ++ gchar* title; ++ const gchar* text; ++ const gchar* icon; ++ NotifyUrgency urgency; ++}; ++ ++typedef struct _OfflineNotificationContextInfo OfflineNotificationContextInfo; ++ + static NMActiveConnection * + applet_get_best_activating_connection (NMApplet *applet, NMDevice **device) + { +@@ -2020,6 +2034,59 @@ + return NULL; + } + ++static gboolean ++select_merged_notification_text (OfflineNotificationContextInfo *info) ++{ ++ info->urgency = NOTIFY_URGENCY_LOW; ++ /* only do something if this is about full offline state */ ++ if(info->state != NM_STATE_UNKNOWN || info->device_state != NM_DEVICE_STATE_UNKNOWN) { ++ info->urgency = NOTIFY_URGENCY_NORMAL; ++ if (!info->title) ++ info->title = g_strdup (_("Network")); ++ if (info->state == NM_STATE_DISCONNECTED || info->state == NM_STATE_ASLEEP) { ++ info->urgency = NOTIFY_URGENCY_CRITICAL; ++ info->text = _("Disconnected - you are now offline"); ++ } else ++ info->text = _("Disconnected"); ++ ++ switch (info->device_type) { ++ case NM_DEVICE_TYPE_ETHERNET: ++ info->icon = "notification-network-ethernet-disconnected"; ++ break; ++ case NM_DEVICE_TYPE_WIFI: ++ info->icon = "notification-network-wireless-disconnected"; ++ break; ++ case NM_DEVICE_TYPE_GSM: ++ info->icon = "notification-gsm-disconnected"; ++ break; ++ default: ++ info->icon = "nm-no-connection"; ++ break; ++ } ++ g_debug("going for offline with icon: %s", info->icon); ++ return TRUE; ++ } ++ return FALSE; ++} ++ ++static gboolean ++foo_online_offline_deferred_notify (gpointer user_data) ++{ ++ NMApplet *applet = NM_APPLET (user_data); ++ OfflineNotificationContextInfo *info = applet->notification_queue_data; ++ if(select_merged_notification_text (info)) ++ applet_do_notify (applet, info->urgency, info->title, info->text, info->icon, NULL, NULL, NULL, applet); ++ else ++ g_debug("no notification because merged found that we have nothing to say (e.g. not offline)"); ++ if (info->title) ++ g_free (info->title); ++ info->title = NULL; ++ g_free (applet->notification_queue_data); ++ applet->notification_queue_data = NULL; ++ applet->deferred_id = 0; ++ return FALSE; ++} ++ + static void + applet_common_device_state_changed (NMDevice *device, + NMDeviceState new_state, +@@ -2035,6 +2102,54 @@ + vpn_activating = applet_is_any_vpn_activating (applet); + + switch (new_state) { ++ case NM_DEVICE_STATE_FAILED: ++ case NM_DEVICE_STATE_DISCONNECTED: ++ case NM_DEVICE_STATE_UNMANAGED: ++ case NM_DEVICE_STATE_UNAVAILABLE: ++ { ++ if (old_state != NM_DEVICE_STATE_FAILED && ++ old_state != NM_DEVICE_STATE_UNKNOWN && ++ old_state != NM_DEVICE_STATE_DISCONNECTED && ++ old_state != NM_DEVICE_STATE_UNMANAGED && ++ old_state != NM_DEVICE_STATE_UNAVAILABLE) { ++ OfflineNotificationContextInfo *info = applet->notification_queue_data; ++ if (!info) { ++ info = g_new0(OfflineNotificationContextInfo, 1); ++ applet->notification_queue_data = info; ++ } ++ ++ info->device_state = new_state; ++ info->device_state_reason = reason; ++ if (info->title) { ++ g_free(info->title); ++ info->title = NULL; ++ } ++ if (NM_IS_DEVICE_WIFI (device)) { ++ info->device_type = NM_DEVICE_TYPE_WIFI; ++ info->title = g_strdup(g_object_get_data (G_OBJECT(device), "canonical-last-essid")); ++ if (!info->title) ++ info->title = g_strdup (_("Wireless network")); ++ } else if (NM_IS_DEVICE_ETHERNET (device)) { ++ info->device_type = NM_DEVICE_TYPE_ETHERNET; ++ info->title = g_strdup(_("Wired network")); ++ } else if (NM_IS_GSM_DEVICE (device)) { ++ info->device_type = NM_DEVICE_TYPE_GSM; ++ info->title = g_strdup (_("GSM network")); ++ } else { ++ info->device_type = NM_DEVICE_TYPE_UNKNOWN; ++ info->title = g_strdup (_("Network")); ++ } ++ ++ if (applet->deferred_id) ++ g_source_remove (applet->deferred_id); ++ applet->deferred_id = g_timeout_add (1000, foo_online_offline_deferred_notify, applet); ++ ++ clear_animation_timeout (applet); ++ } else { ++ g_debug ("old state indicates that this was not a disconnect %d", old_state); ++ } ++ break; ++ } + case NM_DEVICE_STATE_PREPARE: + case NM_DEVICE_STATE_CONFIG: + case NM_DEVICE_STATE_NEED_AUTH: +@@ -2112,13 +2227,26 @@ + { + NMApplet *applet = NM_APPLET (user_data); + ++ g_debug("foo_client_state_changed_cb"); + switch (nm_client_get_state (client)) { + case NM_STATE_DISCONNECTED: +- applet_do_notify_with_pref (applet, _("Disconnected"), +- _("The network connection has been disconnected."), +- "nm-no-connection", +- PREF_DISABLE_DISCONNECTED_NOTIFICATIONS); ++ case NM_STATE_ASLEEP: ++ { ++ OfflineNotificationContextInfo *info = applet->notification_queue_data; ++ if (!info) { ++ info = g_new0(OfflineNotificationContextInfo, 1); ++ applet->notification_queue_data = info; ++ } ++ ++ info->state = nm_client_get_state (client); ++ select_merged_notification_text (info); ++ ++ if (applet->deferred_id) ++ g_source_remove (applet->deferred_id); ++ applet->deferred_id = g_timeout_add (1000, foo_online_offline_deferred_notify, applet); ++ + /* Fall through */ ++ } + default: + break; + } +Index: network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet.h +=================================================================== +--- network-manager-applet-0.8.2+git.20101123t161608.f143e76.orig/src/applet.h 2010-11-26 13:34:34.000000000 -0500 ++++ network-manager-applet-0.8.2+git.20101123t161608.f143e76/src/applet.h 2010-11-26 13:50:08.513452112 -0500 +@@ -167,6 +167,9 @@ + GladeXML * info_dialog_xml; + NotifyNotification* notification; + gboolean notify_actions; ++ ++ gpointer notification_queue_data; ++ guint deferred_id; + } NMApplet; + + typedef void (*AppletNewAutoConnectionCallback) (NMConnection *connection, --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp328572-dxteam-connect-text.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/lp328572-dxteam-connect-text.patch @@ -0,0 +1,34 @@ +=== modified file 'src/applet-device-wifi.c' +--- + src/applet-device-wifi.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +Index: network-manager-applet-0.8~a~git.20090830t224938.0334788/src/applet-device-wifi.c +=================================================================== +--- network-manager-applet-0.8~a~git.20090830t224938.0334788.orig/src/applet-device-wifi.c 2009-08-31 19:30:00.000000000 -0400 ++++ network-manager-applet-0.8~a~git.20090830t224938.0334788/src/applet-device-wifi.c 2009-08-31 19:32:23.000000000 -0400 +@@ -1164,7 +1164,6 @@ + { + NMSettingsConnectionInterface *connection; + NMAccessPoint *new = NULL; +- char *msg; + char *esc_ssid = NULL; + + new = update_active_ap (device, new_state, applet); +@@ -1187,12 +1186,11 @@ + nm_settings_connection_interface_update (connection, bssid_update_cb, NULL); + } + +- 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", ++ applet_do_notify_with_pref (applet, ++ esc_ssid ? esc_ssid : _("(none)"), ++ _("Connection Established"), ++ "nm-device-wireless", + PREF_DISABLE_CONNECTED_NOTIFICATIONS); +- g_free (msg); + g_free (esc_ssid); + } + --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp330608_dxteam_gsm_connect_text.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/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); + } + } + + --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/nm-applet-use-indicator.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/nm-applet-use-indicator.patch @@ -0,0 +1,1878 @@ +From: Mathieu Trudel-Lapierre +Subject: Implement conditional support for libappindicator + +To get better integration with Unity (and actually have nm-applet show up at +all with Unity / compiz), implement drawing the applet using libappindicator. + +To play well with others, this patch actually implements libappindicator +conditionally to running configure with --enable-indicator. + +=== modified file 'configure.ac' +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/configure.ac +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/configure.ac 2010-12-09 09:51:28.000000000 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/configure.ac 2011-01-17 12:18:41.881407881 -0500 +@@ -114,6 +114,14 @@ + ;; + esac + ++AC_ARG_ENABLE([indicator], ++[ --enable-appindicator Enables using libappindicator to draw the applet ++ on the screen, instead of the standard status icons.], ++[ ++ PKG_CHECK_MODULES(APPINDICATOR, appindicator-0.1) ++ AC_DEFINE([ENABLE_INDICATOR], 1, [Enable using libappindicator]) ++]) ++ + AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes") + + # Check for libnotify >= 0.7 +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/Makefile.am +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/Makefile.am 2010-12-09 09:51:28.000000000 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/Makefile.am 2011-01-17 12:18:41.881407881 -0500 +@@ -5,6 +5,7 @@ + nm_applet_CPPFLAGS = \ + $(NMA_CFLAGS) \ + $(NOTIFY_CFLAGS) \ ++ $(APPINDICATOR_CFLAGS) \ + -DICONDIR=\""$(datadir)/icons"\" \ + -DUIDIR=\""$(uidir)"\" \ + -DBINDIR=\""$(bindir)"\" \ +@@ -55,6 +56,7 @@ + -lm \ + $(NMA_LIBS) \ + $(NOTIFY_LIBS) \ ++ $(APPINDICATOR_LIBS) \ + ${top_builddir}/src/marshallers/libmarshallers.la \ + ${top_builddir}/src/utils/libutils.la \ + ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet-device-bt.c +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/applet-device-bt.c 2010-12-09 09:51:28.000000000 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet-device-bt.c 2011-01-17 12:18:41.881407881 -0500 +@@ -154,7 +154,9 @@ + + item = applet_menu_item_create_device_item_helper (device, applet, text); + ++#ifndef ENABLE_INDICATOR + gtk_widget_set_sensitive (item, FALSE); ++#endif + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show (item); + +@@ -209,7 +211,11 @@ + } + } + ++#ifndef ENABLE_INDICATOR + static GdkPixbuf * ++#else ++static gboolean ++#endif + bt_get_icon (NMDevice *device, + NMDeviceState state, + NMConnection *connection, +@@ -217,7 +223,11 @@ + NMApplet *applet) + { + NMSettingConnection *s_con; ++#ifndef ENABLE_INDICATOR + GdkPixbuf *pixbuf = NULL; ++#else ++ gboolean icon_is_set = FALSE; ++#endif + const char *id; + + id = nm_device_get_iface (NM_DEVICE (device)); +@@ -240,14 +250,23 @@ + *tip = g_strdup_printf (_("Requesting a network address for '%s'..."), id); + break; + case NM_DEVICE_STATE_ACTIVATED: ++#ifndef ENABLE_INDICATOR + pixbuf = nma_icon_check_and_load ("nm-device-wwan", &applet->wwan_icon, applet); ++#else ++ app_indicator_set_icon (applet->status_icon, "nm-device-wwan"); ++ icon_is_set = TRUE; ++#endif + *tip = g_strdup_printf (_("Mobile broadband connection '%s' active"), id); + break; + default: + break; + } + ++#ifndef ENABLE_INDICATOR + return pixbuf; ++#else ++ return icon_is_set; ++#endif + } + + typedef struct { +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet-device-cdma.c +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/applet-device-cdma.c 2010-12-09 09:51:28.000000000 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet-device-cdma.c 2011-01-17 12:18:41.881407881 -0500 +@@ -263,6 +263,9 @@ + char *text; + GtkWidget *item; + GSList *connections, *all, *iter; ++#ifdef ENABLE_INDICATOR ++ GtkWidget *signal_icon; ++#endif + + info = g_object_get_data (G_OBJECT (device), "devinfo"); + +@@ -284,7 +287,9 @@ + } + + item = applet_menu_item_create_device_item_helper (device, applet, text); ++#ifndef ENABLE_INDICATOR + gtk_widget_set_sensitive (item, FALSE); ++#endif + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show (item); + g_free (text); +@@ -296,6 +301,7 @@ + s_con = (NMSettingConnection *) nm_connection_get_setting (active, NM_TYPE_SETTING_CONNECTION); + g_assert (s_con); + ++#ifndef ENABLE_INDICATOR + item = nm_mb_menu_item_new (nm_setting_connection_get_id (s_con), + info->quality_valid ? info->quality : 0, + info->provider_name, +@@ -303,6 +309,19 @@ + cdma_state_to_mb_state (info), + info->modem_enabled, + applet); ++#else ++ text = mobile_helper_get_connection_label (nm_setting_connection_get_id (s_con), ++ info->provider_name, ++ cdma_act_to_mb_act (info), ++ cdma_state_to_mb_state (info)); ++ item = gtk_image_menu_item_new_with_label (text); ++ g_free (text); ++ text = mobile_helper_get_quality_icon (info->quality, applet); ++ signal_icon = gtk_image_new_from_icon_name (text, GTK_ICON_SIZE_LARGE_TOOLBAR); ++ g_free (text); ++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon); ++ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE); ++#endif + + add_connection_item (device, active, item, menu, applet); + } +@@ -316,6 +335,7 @@ + } + } else { + /* Otherwise show idle registration state or disabled */ ++#ifndef ENABLE_INDICATOR + item = nm_mb_menu_item_new (NULL, + info->quality_valid ? info->quality : 0, + info->provider_name, +@@ -323,11 +343,25 @@ + cdma_state_to_mb_state (info), + info->modem_enabled, + applet); ++#else ++ text = mobile_helper_get_connection_label (NULL, ++ info->provider_name, ++ cdma_act_to_mb_act (info), ++ cdma_state_to_mb_state (info)); ++ item = gtk_image_menu_item_new_with_label (text); ++ g_free (text); ++ text = mobile_helper_get_quality_icon (info->quality, applet); ++ signal_icon = gtk_image_new_from_icon_name (text, GTK_ICON_SIZE_LARGE_TOOLBAR); ++ g_free (text); ++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon); ++ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE); ++ gtk_widget_set_sensitive (item, FALSE); ++#endif + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + } + + /* Add the default / inactive connection items */ +- if (!nma_menu_device_check_unusable (device)) { ++ if (!nma_menu_device_check_unusable (device) && nm_client_wwan_get_enabled(applet->nm_client)) { + if ((!active && g_slist_length (connections)) || (active && g_slist_length (connections) > 1)) + applet_menu_item_add_complex_separator_helper (menu, applet, _("Available"), -1); + +@@ -387,7 +421,11 @@ + check_start_polling (info); + } + ++#ifndef ENABLE_INDICATOR + static GdkPixbuf * ++#else ++static gboolean ++#endif + cdma_get_icon (NMDevice *device, + NMDeviceState state, + NMConnection *connection, +@@ -395,7 +433,11 @@ + NMApplet *applet) + { + NMSettingConnection *s_con; ++#ifndef ENABLE_INDICATOR + GdkPixbuf *pixbuf = NULL; ++#else ++ gboolean icon_is_set = FALSE; ++#endif + const char *id; + CdmaDeviceInfo *info; + gboolean mb_state; +@@ -424,11 +466,17 @@ + break; + case NM_DEVICE_STATE_ACTIVATED: + mb_state = cdma_state_to_mb_state (info); ++#ifndef ENABLE_INDICATOR + pixbuf = mobile_helper_get_status_pixbuf (info->quality, + info->quality_valid, + mb_state, + cdma_act_to_mb_act (info), + applet); ++#else ++ /* FIXME: handle different signal levels with indicator icons. */ ++ app_indicator_set_icon (applet->status_icon, "nm-device-wwan"); ++ icon_is_set = TRUE; ++#endif + + if ((mb_state != MB_STATE_UNKNOWN) && info->quality_valid) { + gboolean roaming = (mb_state == MB_STATE_ROAMING); +@@ -444,7 +492,11 @@ + break; + } + ++#ifndef ENABLE_INDICATOR + return pixbuf; ++#else ++ return icon_is_set; ++#endif + } + + typedef struct { +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet-device-gsm.c +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/applet-device-gsm.c 2011-01-17 12:18:41.681407881 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet-device-gsm.c 2011-01-17 12:18:41.881407881 -0500 +@@ -41,6 +41,7 @@ + #include "applet-device-gsm.h" + #include "utils.h" + #include "mobile-wizard.h" ++#include "mobile-helpers.h" + #include "applet-dialogs.h" + #include "mb-menu-item.h" + #include "nma-marshal.h" +@@ -307,6 +308,9 @@ + char *text; + GtkWidget *item; + GSList *connections, *all, *iter; ++#ifdef ENABLE_INDICATOR ++ GtkWidget *signal_icon; ++#endif + + info = g_object_get_data (G_OBJECT (device), "devinfo"); + +@@ -328,7 +332,9 @@ + } + + item = applet_menu_item_create_device_item_helper (device, applet, text); ++#ifndef ENABLE_INDICATOR + gtk_widget_set_sensitive (item, FALSE); ++#endif + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show (item); + g_free (text); +@@ -340,6 +346,7 @@ + s_con = (NMSettingConnection *) nm_connection_get_setting (active, NM_TYPE_SETTING_CONNECTION); + g_assert (s_con); + ++#ifndef ENABLE_INDICATOR + item = nm_mb_menu_item_new (nm_setting_connection_get_id (s_con), + info->quality_valid ? info->quality : 0, + info->op_name, +@@ -347,6 +354,19 @@ + gsm_state_to_mb_state (info), + info->modem_enabled, + applet); ++#else ++ text = mobile_helper_get_connection_label (nm_setting_connection_get_id (s_con), ++ info->op_name, ++ gsm_act_to_mb_act (info), ++ gsm_state_to_mb_state (info)); ++ item = gtk_image_menu_item_new_with_label (text); ++ g_free (text); ++ text = mobile_helper_get_quality_icon (info->quality, applet); ++ signal_icon = gtk_image_new_from_icon_name (text, GTK_ICON_SIZE_LARGE_TOOLBAR); ++ g_free (text); ++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon); ++ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE); ++#endif + + add_connection_item (device, active, item, menu, applet); + } +@@ -359,6 +379,7 @@ + gtk_widget_show (item); + } + } else { ++#ifndef ENABLE_INDICATOR + item = nm_mb_menu_item_new (NULL, + info->quality_valid ? info->quality : 0, + info->op_name, +@@ -366,6 +387,21 @@ + gsm_state_to_mb_state (info), + info->modem_enabled, + applet); ++#else ++ text = mobile_helper_get_connection_label (NULL, ++ info->op_name, ++ gsm_act_to_mb_act (info), ++ gsm_state_to_mb_state (info)); ++ item = gtk_image_menu_item_new_with_label (text); ++ g_free (text); ++ text = mobile_helper_get_quality_icon (info->quality, applet); ++ signal_icon = gtk_image_new_from_icon_name (text, GTK_ICON_SIZE_LARGE_TOOLBAR); ++ g_free (text); ++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), signal_icon); ++ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE); ++ gtk_widget_set_sensitive (item, FALSE); ++#endif ++ + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + } + +@@ -425,7 +461,11 @@ + check_start_polling (info); + } + ++#ifndef ENABLE_INDICATOR + static GdkPixbuf * ++#else ++static gboolean ++#endif + gsm_get_icon (NMDevice *device, + NMDeviceState state, + NMConnection *connection, +@@ -433,7 +473,11 @@ + NMApplet *applet) + { + NMSettingConnection *s_con; ++#ifndef ENABLE_INDICATOR + GdkPixbuf *pixbuf = NULL; ++#else ++ gboolean icon_is_set = FALSE; ++#endif + const char *id; + GsmDeviceInfo *info; + guint32 mb_state; +@@ -462,11 +506,17 @@ + break; + case NM_DEVICE_STATE_ACTIVATED: + mb_state = gsm_state_to_mb_state (info); ++#ifndef ENABLE_INDICATOR + pixbuf = mobile_helper_get_status_pixbuf (info->quality, + info->quality_valid, + mb_state, + gsm_act_to_mb_act (info), + applet); ++#else ++ /* FIXME: handle different signal levels for indicator icon */ ++ app_indicator_set_icon (applet->status_icon, "nm-device-wwan"); ++ icon_is_set = TRUE; ++#endif + + if ((mb_state != MB_STATE_UNKNOWN) && info->quality_valid) { + gboolean roaming = (mb_state == MB_STATE_ROAMING); +@@ -482,7 +532,11 @@ + break; + } + ++#ifndef ENABLE_INDICATOR + return pixbuf; ++#else ++ return icon_is_set; ++#endif + } + + typedef struct { +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet-device-wifi.c +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/applet-device-wifi.c 2011-01-17 12:18:41.761407881 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet-device-wifi.c 2011-01-17 12:18:41.921407881 -0500 +@@ -323,6 +323,51 @@ + return NULL; + } + ++#ifdef ENABLE_INDICATOR ++static char * ++get_best_icon_name_for_ap (NMAccessPoint *ap, gboolean need_sec, gboolean encrypted) ++{ ++ char *icon_name = NULL; ++ guint32 strength; ++ ++ g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), NULL); ++ ++ strength = nm_access_point_get_strength (ap); ++ strength = CLAMP (strength, 0, 100); ++ ++ if (strength > 80) ++ icon_name = g_strdup_printf ("nm-signal-100"); ++ else if (strength > 55) ++ icon_name = g_strdup_printf ("nm-signal-75"); ++ else if (strength > 30) ++ icon_name = g_strdup_printf ("nm-signal-50"); ++ else if (strength > 5) ++ icon_name = g_strdup_printf ("nm-signal-25"); ++ else ++ icon_name = g_strdup_printf ("nm-signal-00"); ++ ++ if (nm_access_point_get_mode (ap) == NM_802_11_MODE_ADHOC) { ++ icon_name = g_strdup_printf ("nm-adhoc"); ++ return icon_name; ++ } ++ ++ if (need_sec && encrypted) ++ icon_name = g_strdup_printf ("%s-secure", icon_name); ++ ++ return icon_name; ++} ++ ++static char * ++escape_mnemonics (const char *ssid) ++{ ++ gchar **split_ssid = g_strsplit (ssid, "_", 0); ++ gchar *clean_ssid = g_strjoinv ("__", split_ssid); ++ g_strfreev (split_ssid); ++ ++ return clean_ssid; ++} ++#endif ++ + static void + check_common_ssid (NMAccessPoint *ap, NMSettingWireless *s_wifi) + { +@@ -560,6 +619,10 @@ + info->ap = g_object_ref (G_OBJECT (ap)); + info->connection = g_object_ref (G_OBJECT (connection)); + ++#ifdef ENABLE_INDICATOR ++ g_object_set_data_full (G_OBJECT (subitem), "connection", G_OBJECT (connection), (GDestroyNotify) g_free); ++#endif ++ + g_signal_connect_data (subitem, "activate", + G_CALLBACK (wireless_menu_item_activate), + info, +@@ -580,6 +643,9 @@ + if (g_slist_length (ap_connections) == 1) { + connection = NM_CONNECTION (g_slist_nth_data (ap_connections, 0)); + info->connection = g_object_ref (G_OBJECT (connection)); ++#ifdef ENABLE_INDICATOR ++ g_object_set_data_full (G_OBJECT (item), "connection", G_OBJECT (connection), (GDestroyNotify) g_free); ++#endif + } + + g_signal_connect_data (GTK_WIDGET (item), +@@ -616,13 +682,21 @@ + */ + dup_data.found = NULL; + dup_data.hash = g_object_get_data (G_OBJECT (ap), "hash"); ++#ifndef ENABLE_INDICATOR + g_return_val_if_fail (dup_data.hash != NULL, NULL); ++#else ++ /* heh, not much choice here, otherwise on startup we get tons of errors ++ * because g_return_val_if_fail prints assertion errors. ++ */ ++ if (dup_data.hash == NULL) ++ return NULL; ++#endif + + dup_data.device = NM_DEVICE (device); + g_slist_foreach (menu_list, find_duplicate, &dup_data); + + if (dup_data.found) { +- nm_network_menu_item_best_strength (dup_data.found, nm_access_point_get_strength (ap), applet); ++ //nm_network_menu_item_best_strength (dup_data.found, nm_access_point_get_strength (ap), applet); + nm_network_menu_item_add_dupe (dup_data.found, ap); + return NULL; + } +@@ -733,6 +807,11 @@ + gboolean wireless_hw_enabled = TRUE; + GSList *menu_items = NULL; /* All menu items we'll be adding */ + NMNetworkMenuItem *item, *active_item = NULL; ++#if ENABLE_INDICATOR ++ GtkWidget *imi, *icon_image; ++ WirelessMenuItemInfo *info; ++ gboolean is_encrypted; ++#endif + GtkWidget *widget; + + wdev = NM_DEVICE_WIFI (device); +@@ -756,7 +835,9 @@ + widget = applet_menu_item_create_device_item_helper (device, applet, text); + g_free (text); + ++#ifndef ENABLE_INDICATOR + gtk_widget_set_sensitive (widget, FALSE); ++#endif + gtk_menu_shell_append (GTK_MENU_SHELL (menu), widget); + gtk_widget_show (widget); + +@@ -773,8 +854,36 @@ + nm_network_menu_item_set_active (item, TRUE); + menu_items = g_slist_append (menu_items, item); + ++#if ENABLE_INDICATOR ++ text = escape_mnemonics (nm_network_menu_item_get_ssid (item)); ++ imi = gtk_image_menu_item_new_with_label (text); ++ g_free (text); ++ ++ is_encrypted = nm_network_menu_item_get_is_encrypted(item); ++ ++ icon_image = gtk_image_new_from_icon_name (get_best_icon_name_for_ap (active_ap, TRUE, is_encrypted), ++ GTK_ICON_SIZE_LARGE_TOOLBAR); ++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (imi), icon_image); ++ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (imi), TRUE); ++ ++ info = g_slice_new0 (WirelessMenuItemInfo); ++ info->applet = applet; ++ info->device = g_object_ref (G_OBJECT (device)); ++ info->ap = g_object_ref (G_OBJECT (active_ap)); ++ info->connection = g_object_get_data (G_OBJECT (item), "connection"); ++ ++ g_signal_connect_data (GTK_WIDGET (imi), ++ "activate", ++ G_CALLBACK (wireless_menu_item_activate), ++ info, ++ (GClosureNotify) wireless_menu_item_info_destroy, ++ 0); ++ ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), GTK_WIDGET (imi)); ++#else + gtk_menu_shell_append (GTK_MENU_SHELL (menu), GTK_WIDGET (item)); + gtk_widget_show_all (GTK_WIDGET (item)); ++#endif + } + } + } +@@ -801,7 +910,38 @@ + + item = get_menu_item_for_ap (wdev, ap, connections, menu_items, applet); + if (item) ++#if ENABLE_INDICATOR ++ { ++ text = escape_mnemonics (nm_network_menu_item_get_ssid (item)); ++ imi = gtk_image_menu_item_new_with_label (text); ++ g_free (text); ++ ++ is_encrypted = nm_network_menu_item_get_is_encrypted(item); ++ ++ icon_image = gtk_image_new_from_icon_name (get_best_icon_name_for_ap (ap, TRUE, is_encrypted), ++ GTK_ICON_SIZE_MENU); ++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (imi), icon_image); ++ gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (imi), TRUE); ++ ++ info = g_slice_new0 (WirelessMenuItemInfo); ++ info->applet = applet; ++ info->device = g_object_ref (G_OBJECT (device)); ++ info->ap = g_object_ref (G_OBJECT (ap)); ++ info->connection = g_object_get_data (G_OBJECT (item), "connection"); ++ ++ g_signal_connect_data (GTK_WIDGET (imi), ++ "activate", ++ G_CALLBACK (wireless_menu_item_activate), ++ info, ++ (GClosureNotify) wireless_menu_item_info_destroy, ++ 0); ++ ++ g_object_set_data_full (G_OBJECT (item), "nm-network-menu-item", imi, (GDestroyNotify) g_free); + menu_items = g_slist_append (menu_items, item); ++ } ++#else ++ menu_items = g_slist_append (menu_items, item); ++#endif + } + + /* Now remove the active AP item from the list, as we've already dealt with +@@ -835,8 +975,12 @@ + topmenu_items = g_slist_sort (topmenu_items, sort_by_name); + + for (iter = topmenu_items; iter; iter = g_slist_next (iter)) { ++#if ENABLE_INDICATOR ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), GTK_WIDGET (g_object_get_data(iter->data, "nm-network-menu-item"))); ++#else + gtk_menu_shell_append (GTK_MENU_SHELL (menu), GTK_WIDGET (iter->data)); + gtk_widget_show_all (GTK_WIDGET (iter->data)); ++#endif + } + g_slist_free (topmenu_items); + topmenu_items = NULL; +@@ -856,7 +1000,11 @@ + + /* And add the rest to the submenu */ + for (iter = sorted_subitems; iter; iter = g_slist_next (iter)) ++#if ENABLE_INDICATOR ++ gtk_menu_shell_append (GTK_MENU_SHELL (submenu), GTK_WIDGET (g_object_get_data(iter->data, "nm-network-menu-item"))); ++#else + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), GTK_WIDGET (iter->data)); ++#endif + g_slist_free (sorted_subitems); + + gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem); +@@ -1093,6 +1241,12 @@ + applet); + + queue_avail_access_point_notification (NM_DEVICE (device)); ++#ifdef ENABLE_INDICATOR ++ if (!applet->menu_update_id) ++ applet->menu_update_id = g_idle_add_full (G_PRIORITY_LOW, ++ (GSourceFunc) status_icon_activate_cb, ++ applet, NULL); ++#endif + } + + static void +@@ -1111,6 +1265,12 @@ + g_object_set_data (G_OBJECT (device), ACTIVE_AP_TAG, NULL); + applet_schedule_update_icon (applet); + } ++#ifdef ENABLE_INDICATOR ++ if (!applet->menu_update_id) ++ applet->menu_update_id = g_idle_add_full (G_PRIORITY_LOW, ++ (GSourceFunc) status_icon_activate_cb, ++ applet, NULL); ++#endif + } + + static void +@@ -1269,7 +1429,11 @@ + g_free (esc_ssid); + } + ++#ifndef ENABLE_INDICATOR + static GdkPixbuf * ++#else ++static gboolean ++#endif + wireless_get_icon (NMDevice *device, + NMDeviceState state, + NMConnection *connection, +@@ -1278,7 +1442,11 @@ + { + NMSettingConnection *s_con; + NMAccessPoint *ap; ++#ifndef ENABLE_INDICATOR + GdkPixbuf *pixbuf = NULL; ++#else ++ gboolean icon_is_set = FALSE; ++#endif + const char *id; + char *ssid = NULL; + +@@ -1320,6 +1488,7 @@ + strength = nm_access_point_get_strength (ap); + strength = CLAMP (strength, 0, 100); + ++#ifndef ENABLE_INDICATOR + if (strength > 80) + pixbuf = nma_icon_check_and_load ("nm-signal-100", &applet->wireless_100_icon, applet); + else if (strength > 55) +@@ -1330,11 +1499,20 @@ + pixbuf = nma_icon_check_and_load ("nm-signal-25", &applet->wireless_25_icon, applet); + else + pixbuf = nma_icon_check_and_load ("nm-signal-00", &applet->wireless_00_icon, applet); ++#else ++ // here we don't care whether or not the ap has security, just want to show signal strength ++ app_indicator_set_icon (applet->status_icon, get_best_icon_name_for_ap (ap, FALSE, FALSE)); ++ icon_is_set = TRUE; ++#endif + + *tip = g_strdup_printf (_("Wireless network connection '%s' active: %s (%d%%)"), + id, ssid, strength); + } else { ++#ifndef ENABLE_INDICATOR + pixbuf = nma_icon_check_and_load ("nm-signal-00", &applet->wireless_00_icon, applet); ++#else ++ app_indicator_set_icon (applet->status_icon, "nm-signal-00"); ++#endif + *tip = g_strdup_printf (_("Wireless network connection '%s' active"), id); + } + break; +@@ -1343,7 +1521,11 @@ + } + + g_free (ssid); ++#ifndef ENABLE_INDICATOR + return pixbuf; ++#else ++ return icon_is_set; ++#endif + } + + static void +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet-device-wired.c +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/applet-device-wired.c 2011-01-17 12:18:41.681407881 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet-device-wired.c 2011-01-17 12:18:41.931407881 -0500 +@@ -222,7 +222,9 @@ + if (nm_device_get_capabilities (device) & NM_DEVICE_CAP_CARRIER_DETECT) + carrier = nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (device)); + ++#ifndef ENABLE_INDICATOR + gtk_widget_set_sensitive (item, FALSE); ++#endif + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show (item); + +@@ -275,7 +277,11 @@ + } + } + ++#ifndef ENABLE_INDICATOR + static GdkPixbuf * ++#else ++static gboolean ++#endif + wired_get_icon (NMDevice *device, + NMDeviceState state, + NMConnection *connection, +@@ -283,7 +289,11 @@ + NMApplet *applet) + { + NMSettingConnection *s_con; ++#ifndef ENABLE_INDICATOR + GdkPixbuf *pixbuf = NULL; ++#else ++ gboolean icon_is_set = FALSE; ++#endif + const char *id; + + id = nm_device_get_iface (NM_DEVICE (device)); +@@ -306,14 +316,23 @@ + *tip = g_strdup_printf (_("Requesting a wired network address for '%s'..."), id); + break; + case NM_DEVICE_STATE_ACTIVATED: ++#ifndef ENABLE_INDICATOR + pixbuf = nma_icon_check_and_load ("nm-device-wired", &applet->wired_icon, applet); ++#else ++ app_indicator_set_icon (applet->status_icon, "nm-device-wired"); ++ icon_is_set = TRUE; ++#endif + *tip = g_strdup_printf (_("Wired network connection '%s' active"), id); + break; + default: + break; + } + ++#ifndef ENABLE_INDICATOR + return pixbuf; ++#else ++ return icon_is_set; ++#endif + } + + /* PPPoE */ +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet.c +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/applet.c 2011-01-17 12:18:41.851407881 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet.c 2011-01-17 12:19:08.741407881 -0500 +@@ -438,6 +438,7 @@ + int pos) + { + GtkWidget *menu_item = gtk_image_menu_item_new (); ++#ifndef ENABLE_INDICATOR + GtkWidget *box = gtk_hbox_new (FALSE, 0); + GtkWidget *xlabel = NULL; + +@@ -455,6 +456,9 @@ + "child", box, + "sensitive", FALSE, + NULL); ++#else ++ menu_item = gtk_separator_menu_item_new (); ++#endif + if (pos < 0) + gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); + else +@@ -469,10 +473,13 @@ + { + GtkWidget *item; + NMSettingConnection *s_con; ++#ifndef ENABLE_INDICATOR + char *markup; + GtkWidget *label; ++#endif + + s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); ++#ifndef ENABLE_INDICATOR + item = gtk_image_menu_item_new_with_label (""); + if (add_active && (active == connection)) { + /* Pure evil */ +@@ -485,9 +492,13 @@ + gtk_menu_item_set_label (GTK_MENU_ITEM (item), nm_setting_connection_get_id (s_con)); + + gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE); ++#else ++ item = gtk_menu_item_new_with_label (nm_setting_connection_get_id (s_con)); ++#endif + return item; + } + ++#ifndef ENABLE_INDICATOR + #define TITLE_TEXT_R ((double) 0x5e / 255.0 ) + #define TITLE_TEXT_G ((double) 0x5e / 255.0 ) + #define TITLE_TEXT_B ((double) 0x5e / 255.0 ) +@@ -567,7 +578,7 @@ + gtk_widget_set_size_request (widget, width + 2 * xpadding, height + ypadding + postpadding); + return TRUE; + } +- ++#endif + + GtkWidget * + applet_menu_item_create_device_item_helper (NMDevice *device, +@@ -578,7 +589,9 @@ + + item = gtk_menu_item_new_with_mnemonic (text); + gtk_widget_set_sensitive (item, FALSE); ++#ifndef ENABLE_INDICATOR + g_signal_connect (item, "expose-event", G_CALLBACK (menu_title_item_expose), NULL); ++#endif + return item; + } + +@@ -620,7 +633,11 @@ + g_return_if_fail (summary != NULL); + g_return_if_fail (message != NULL); + ++#ifndef ENABLE_INDICATOR + if (!gtk_status_icon_is_embedded (applet->status_icon)) ++#else ++ if (app_indicator_get_status (applet->status_icon) == APP_INDICATOR_STATUS_PASSIVE) ++#endif + return; + + escaped = utils_escape_notify_message (message); +@@ -646,9 +663,11 @@ + + g_free (escaped); + ++#ifndef ENABLE_INDICATOR + #if !HAVE_LIBNOTIFY_07 + notify_notification_attach_to_status_icon (notify, applet->status_icon); + #endif ++#endif + notify_notification_set_urgency (notify, urgency); + notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); + +@@ -928,6 +947,12 @@ + else + clear_animation_timeout (applet); + ++#ifdef ENABLE_INDICATOR ++ if (!applet->menu_update_id) ++ applet->menu_update_id = g_idle_add_full (G_PRIORITY_LOW, ++ (GSourceFunc) status_icon_activate_cb, ++ applet, NULL); ++#endif + applet_schedule_update_icon (applet); + } + +@@ -1362,6 +1387,21 @@ + return item; + } + ++#ifdef ENABLE_INDICATOR ++static void ++nma_flight_toggled_cb (GtkWidget *widget, NMApplet *applet) ++{ ++ gboolean state; ++ ++ g_return_if_fail (applet != NULL); ++ g_return_if_fail (widget != NULL); ++ ++ state = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)); ++ nm_client_wireless_set_enabled (applet->nm_client, !state); ++ nm_client_wwan_set_enabled (applet->nm_client, !state); ++} ++#endif ++ + static guint32 + nma_menu_add_devices (GtkWidget *menu, NMApplet *applet) + { +@@ -1373,6 +1413,9 @@ + gint n_mb_devices = 0; + gint n_bt_devices = 0; + int i; ++#ifdef ENABLE_INDICATOR ++ GtkWidget *widget; ++#endif + + temp = nm_client_get_devices (applet->nm_client); + for (i = 0; temp && (i < temp->len); i++) +@@ -1405,6 +1448,17 @@ + goto out; + } + ++ if (n_wifi_devices || n_mb_devices) { ++ widget = gtk_check_menu_item_new_with_label (_("Flight Mode")); ++ applet->wifi_enabled_toggled_id = ++ g_signal_connect (G_OBJECT (widget), ++ "toggled", ++ G_CALLBACK (nma_flight_toggled_cb), applet); ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), widget); ++ gtk_widget_show (widget); ++ applet->wifi_enabled_item = widget; ++ } ++ + /* Add all devices in our device list to the menu */ + for (iter = devices; iter; iter = iter->next) { + NMDevice *device = NM_DEVICE (iter->data); +@@ -1428,6 +1482,10 @@ + dclass = get_device_class (device, applet); + if (dclass) + dclass->add_menu_item (device, n_devices, active, menu, applet); ++ ++#ifdef ENABLE_INDICATOR ++ nma_menu_add_separator_item (menu); ++#endif + } + + out: +@@ -1485,7 +1543,9 @@ + GSList *list, *iter; + int num_vpn_active = 0; + ++#ifndef ENABLE_INDICATOR + nma_menu_add_separator_item (menu); ++#endif + + vpn_menu = GTK_MENU (gtk_menu_new ()); + +@@ -1505,12 +1565,18 @@ + NMConnection *connection = NM_CONNECTION (iter->data); + NMActiveConnection *active; + const char *name; ++#ifndef ENABLE_INDICATOR + GtkWidget *image; ++#endif + + name = get_connection_id (connection); + ++#ifndef ENABLE_INDICATOR + item = GTK_MENU_ITEM (gtk_image_menu_item_new_with_label (name)); + gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item), TRUE); ++#else ++ item = GTK_MENU_ITEM (gtk_check_menu_item_new_with_label (name)); ++#endif + + /* If no VPN connections are active, draw all menu items enabled. If + * >= 1 VPN connections are active, only the active VPN menu item is +@@ -1526,9 +1592,17 @@ + gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE); + + if (active) { ++#ifndef ENABLE_INDICATOR + image = gtk_image_new_from_stock (GTK_STOCK_CONNECT, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); ++#else ++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), TRUE); ++#endif + } ++#ifdef ENABLE_INDICATOR ++ else ++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(item), FALSE); ++#endif + + g_object_set_data_full (G_OBJECT (item), "connection", + g_object_ref (connection), +@@ -1555,7 +1629,7 @@ + g_slist_free (list); + } + +- ++#ifndef ENABLE_INDICATOR + static void + nma_set_wireless_enabled_cb (GtkWidget *widget, NMApplet *applet) + { +@@ -1573,6 +1647,7 @@ + gboolean state; + + g_return_if_fail (applet != NULL); ++ g_return_if_fail (widget != NULL); + + state = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)); + nm_client_wwan_set_enabled (applet->nm_client, state); +@@ -1584,12 +1659,12 @@ + gboolean state; + + g_return_if_fail (applet != NULL); ++ g_return_if_fail (widget != NULL); + + state = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)); + nm_client_networking_set_enabled (applet->nm_client, state); + } + +- + static void + nma_set_notifications_enabled_cb (GtkWidget *widget, NMApplet *applet) + { +@@ -1612,6 +1687,7 @@ + !state, + NULL); + } ++#endif + + /* + * nma_menu_show_cb +@@ -1622,15 +1698,20 @@ + static void nma_menu_show_cb (GtkWidget *menu, NMApplet *applet) + { + guint32 n_wireless; ++#ifdef ENABLE_INDICATOR ++ GtkWidget *widget; ++#endif + + g_return_if_fail (menu != NULL); + g_return_if_fail (applet != NULL); + ++#ifndef ENABLE_INDICATOR + #if GTK_CHECK_VERSION(2, 15, 0) + gtk_status_icon_set_tooltip_text (applet->status_icon, NULL); + #else + gtk_status_icon_set_tooltip (applet->status_icon, NULL); + #endif ++#endif + + if (!nm_client_get_manager_running (applet->nm_client)) { + nma_menu_add_text_item (menu, _("NetworkManager is not running...")); +@@ -1638,7 +1719,18 @@ + } + + if (nm_client_get_state (applet->nm_client) == NM_STATE_ASLEEP) { ++#ifndef ENABLE_INDICATOR + nma_menu_add_text_item (menu, _("Networking disabled")); ++#else ++ widget = gtk_check_menu_item_new_with_label (_("Flight Mode")); ++ applet->wifi_enabled_toggled_id = ++ g_signal_connect (G_OBJECT (widget), ++ "toggled", ++ G_CALLBACK (nma_flight_toggled_cb), applet); ++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), widget); ++ gtk_widget_show (widget); ++ applet->wifi_enabled_item = widget; ++#endif + return; + } + +@@ -1660,6 +1752,7 @@ + + static gboolean nma_menu_clear (NMApplet *applet); + ++#ifndef ENABLE_INDICATOR + static void + nma_menu_deactivate_cb (GtkWidget *widget, NMApplet *applet) + { +@@ -1676,6 +1769,7 @@ + gtk_status_icon_set_tooltip (applet->status_icon, applet->tip); + #endif + } ++#endif + + /* + * nma_menu_create +@@ -1692,8 +1786,10 @@ + + menu = gtk_menu_new (); + gtk_container_set_border_width (GTK_CONTAINER (menu), 0); ++#ifndef ENABLE_INDICATOR + g_signal_connect (menu, "show", G_CALLBACK (nma_menu_show_cb), applet); + g_signal_connect (menu, "deactivate", G_CALLBACK (nma_menu_deactivate_cb), applet); ++#endif + return menu; + } + +@@ -1730,10 +1826,11 @@ + nma_context_menu_update (NMApplet *applet) + { + NMState state; ++ gboolean wireless_hw_enabled; ++#ifndef ENABLE_INDICATOR + gboolean net_enabled = TRUE; + gboolean have_wireless = FALSE; + gboolean have_wwan = FALSE; +- gboolean wireless_hw_enabled; + gboolean wwan_hw_enabled; + gboolean notifications_enabled = TRUE; + +@@ -1816,6 +1913,29 @@ + gtk_widget_show_all (applet->wwan_enabled_item); + else + gtk_widget_hide (applet->wwan_enabled_item); ++#if 0 ++ if (applet->wifi_enabled_item) ++ gtk_widget_show_all (applet->wifi_enabled_item); ++ if (applet->wwan_enabled_item) ++ gtk_widget_show_all (applet->wwan_enabled_item); ++#endif ++#else ++ state = nm_client_get_state (applet->nm_client); ++ ++ gtk_widget_set_sensitive (applet->info_menu_item, state == NM_STATE_CONNECTED); ++ ++ if (applet->wifi_enabled_item) { ++ g_signal_handler_block (G_OBJECT (applet->wifi_enabled_item), applet->wifi_enabled_toggled_id); ++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (applet->wifi_enabled_item), ++ !nm_client_wireless_get_enabled (applet->nm_client)); ++ g_signal_handler_unblock (G_OBJECT (applet->wifi_enabled_item), applet->wifi_enabled_toggled_id); ++ ++ wireless_hw_enabled = nm_client_wireless_hardware_get_enabled (applet->nm_client); ++ gtk_widget_set_sensitive (GTK_WIDGET (applet->wifi_enabled_item), ++ wireless_hw_enabled && ++ is_permission_yes (applet, NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI)); ++ } ++#endif + } + + static void +@@ -1855,15 +1975,22 @@ + * Generate the contextual popup menu. + * + */ ++#ifndef ENABLE_INDICATOR + static GtkWidget *nma_context_menu_create (NMApplet *applet) ++#else ++static GtkWidget *nma_context_menu_create (NMApplet *applet, GtkMenuShell *menu) ++#endif + { ++#ifndef ENABLE_INDICATOR + GtkMenuShell *menu; ++ guint id; ++#endif + GtkWidget *menu_item; + GtkWidget *image; +- guint id; + + g_return_val_if_fail (applet != NULL, NULL); + ++#ifndef ENABLE_INDICATOR + menu = GTK_MENU_SHELL (gtk_menu_new ()); + + /* 'Enable Networking' item */ +@@ -1905,6 +2032,7 @@ + gtk_menu_shell_append (menu, applet->notifications_enabled_item); + + nma_menu_add_separator_item (GTK_WIDGET (menu)); ++#endif /* ifndef ENABLE_INDICATOR */ + + /* 'Connection Information' item */ + applet->info_menu_item = gtk_image_menu_item_new_with_mnemonic (_("Connection _Information")); +@@ -1954,6 +2082,7 @@ + + /*****************************************************************************/ + ++#ifndef ENABLE_INDICATOR + static void + foo_set_icon (NMApplet *applet, GdkPixbuf *pixbuf, guint32 layer) + { +@@ -1998,6 +2127,7 @@ + gtk_status_icon_set_from_pixbuf (applet->status_icon, pixbuf); + g_object_unref (pixbuf); + } ++#endif + + + NMSettingsConnectionInterface * +@@ -2200,6 +2330,13 @@ + applet_common_device_state_changed (device, new_state, old_state, reason, applet); + + applet_schedule_update_icon (applet); ++ ++#ifdef ENABLE_INDICATOR ++ if (!applet->menu_update_id) ++ applet->menu_update_id = g_idle_add_full (G_PRIORITY_LOW, ++ (GSourceFunc) status_icon_activate_cb, ++ applet, NULL); ++#endif + } + + static void +@@ -2254,6 +2391,12 @@ + break; + } + ++#ifdef ENABLE_INDICATOR ++ if (!applet->menu_update_id) ++ applet->menu_update_id = g_idle_add_full (G_PRIORITY_LOW, ++ (GSourceFunc) status_icon_activate_cb, ++ applet, NULL); ++#endif + applet_schedule_update_icon (applet); + } + +@@ -2373,10 +2516,18 @@ + applet_schedule_update_icon (applet); + } + ++#ifndef ENABLE_INDICATOR + static GdkPixbuf * ++#else ++static gboolean ++#endif + applet_common_get_device_icon (NMDeviceState state, NMApplet *applet) + { ++#ifndef ENABLE_INDICATOR + GdkPixbuf *pixbuf = NULL; ++#else ++ char *name; ++#endif + int stage = -1; + + switch (state) { +@@ -2394,6 +2545,7 @@ + break; + } + ++#ifndef ENABLE_INDICATOR + if (stage >= 0) { + int i, j; + +@@ -2408,12 +2560,23 @@ + } + + pixbuf = applet->network_connecting_icons[stage][applet->animation_step]; ++#endif + applet->animation_step++; + if (applet->animation_step >= NUM_CONNECTING_FRAMES) + applet->animation_step = 0; ++#ifdef ENABLE_INDICATOR ++ name = g_strdup_printf ("nm-stage%02d-connecting%02d", stage+1, applet->animation_step+1); ++ app_indicator_set_icon (applet->status_icon, name); ++ g_free (name); ++#else + } ++#endif + ++#ifndef ENABLE_INDICATOR + return pixbuf; ++#else ++ return TRUE; ++#endif + } + + static char * +@@ -2452,12 +2615,20 @@ + return tip; + } + ++#ifndef ENABLE_INDICATOR + static GdkPixbuf * ++#else ++static void ++#endif + applet_get_device_icon_for_state (NMApplet *applet, char **tip) + { + NMActiveConnection *active; + NMDevice *device = NULL; ++#ifndef ENABLE_INDICATOR + GdkPixbuf *pixbuf = NULL; ++#else ++ gboolean got_icon = FALSE; ++#endif + NMDeviceState state = NM_DEVICE_STATE_UNKNOWN; + NMADeviceClass *dclass; + +@@ -2481,17 +2652,27 @@ + NMConnection *connection; + + connection = applet_find_active_connection_for_device (device, applet, NULL); ++#ifndef ENABLE_INDICATOR + pixbuf = dclass->get_icon (device, state, connection, tip, applet); ++#else ++ got_icon = dclass->get_icon (device, state, connection, tip, applet); ++#endif + if (!*tip) + *tip = get_tip_for_device_state (device, state, connection); + } + + out: +- if (!pixbuf) +- pixbuf = applet_common_get_device_icon (state, applet); ++#ifndef ENABLE_INDICATOR ++ if (!pixbuf) ++ pixbuf = applet_common_get_device_icon (state, applet); + if (!pixbuf) + pixbuf = applet->no_connection_icon; +- return pixbuf; ++ return pixbuf; ++#else ++ if (!got_icon) ++ applet_common_get_device_icon (state, applet); ++ return; ++#endif + } + + static char * +@@ -2565,49 +2746,89 @@ + if (!nm_running) + state = NM_STATE_UNKNOWN; + ++#ifdef ENABLE_INDICATOR ++ if (nm_running) ++ app_indicator_set_status (applet->status_icon, APP_INDICATOR_STATUS_ACTIVE); ++ else ++ app_indicator_set_status (applet->status_icon, APP_INDICATOR_STATUS_PASSIVE); ++#endif ++ + switch (state) { + case NM_STATE_UNKNOWN: + case NM_STATE_ASLEEP: ++#ifndef ENABLE_INDICATOR + pixbuf = nma_icon_check_and_load ("nm-no-connection", &applet->no_connection_icon, applet); ++#else ++ app_indicator_set_icon (applet->status_icon, "nm-no-connection"); ++#endif + dev_tip = g_strdup (_("Networking disabled")); + break; + case NM_STATE_DISCONNECTED: ++#ifndef ENABLE_INDICATOR + pixbuf = nma_icon_check_and_load ("nm-no-connection", &applet->no_connection_icon, applet); ++#else ++ app_indicator_set_icon (applet->status_icon, "nm-no-connection"); ++#endif + dev_tip = g_strdup (_("No network connection")); + break; + default: ++#ifdef ENABLE_INDICATOR ++ applet_get_device_icon_for_state (applet, &dev_tip); ++#else + pixbuf = applet_get_device_icon_for_state (applet, &dev_tip); ++#endif + break; + } + ++#ifndef ENABLE_INDICATOR + foo_set_icon (applet, pixbuf, ICON_LAYER_LINK); ++#endif + + /* VPN state next */ + pixbuf = NULL; + active_vpn = applet_get_first_active_vpn_connection (applet, &vpn_state); + if (active_vpn) { +- int i; +- + switch (vpn_state) { + case NM_VPN_CONNECTION_STATE_ACTIVATED: ++#ifndef ENABLE_INDICATOR + pixbuf = nma_icon_check_and_load ("nm-vpn-active-lock", &applet->vpn_lock_icon, applet); ++#else ++ { ++ char *icon_name_with_vpn = NULL; ++ const gchar *cur_icon_name = app_indicator_get_icon (applet->status_icon); ++ ++ icon_name_with_vpn = g_strdup_printf ("%s-secure", cur_icon_name); ++ app_indicator_set_icon (applet->status_icon, icon_name_with_vpn); ++ g_free (icon_name_with_vpn); ++ } ++#endif + break; + case NM_VPN_CONNECTION_STATE_PREPARE: + case NM_VPN_CONNECTION_STATE_NEED_AUTH: + case NM_VPN_CONNECTION_STATE_CONNECT: + case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: +- for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) { ++#ifndef ENABLE_INDICATOR ++ for (int i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) { + char *name; + + name = g_strdup_printf ("nm-vpn-connecting%02d", i+1); + nma_icon_check_and_load (name, &applet->vpn_connecting_icons[i], applet); + g_free (name); + } ++#endif + + pixbuf = applet->vpn_connecting_icons[applet->animation_step]; + applet->animation_step++; + if (applet->animation_step >= NUM_VPN_CONNECTING_FRAMES) + applet->animation_step = 0; ++#ifdef ENABLE_INDICATOR ++ { ++ char *name; ++ name = g_strdup_printf ("nm-vpn-connecting%02d", applet->animation_step+1); ++ app_indicator_set_icon (applet->status_icon, name); ++ g_free (name); ++ } ++#endif + break; + default: + break; +@@ -2615,7 +2836,9 @@ + + vpn_tip = get_tip_for_vpn (active_vpn, vpn_state, applet); + } ++#ifndef ENABLE_INDICATOR + foo_set_icon (applet, pixbuf, ICON_LAYER_VPN); ++#endif + + if (applet->tip) { + g_free (applet->tip); +@@ -2638,11 +2861,13 @@ + g_string_free (tip, FALSE); + } + ++#ifndef ENABLE_INDICATOR + #if GTK_CHECK_VERSION(2, 15, 0) + gtk_status_icon_set_tooltip_text (applet->status_icon, applet->tip); + #else + gtk_status_icon_set_tooltip (applet->status_icon, applet->tip); + #endif ++#endif + + return FALSE; + } +@@ -2959,7 +3184,11 @@ + g_object_unref (G_OBJECT (applet->icon_theme)); + } + ++#ifdef ENABLE_INDICATOR ++ screen = gdk_screen_get_default(); ++#else + screen = gtk_status_icon_get_screen (applet->status_icon); ++#endif + g_assert (screen); + applet->icon_theme = gtk_icon_theme_get_for_screen (screen); + +@@ -2985,6 +3214,7 @@ + nma_icon_theme_changed (NULL, applet); + } + ++#ifndef ENABLE_INDICATOR + static gboolean + status_icon_size_changed_cb (GtkStatusIcon *icon, + gint size, +@@ -3001,20 +3231,36 @@ + + return TRUE; + } ++#endif + ++#ifdef ENABLE_INDICATOR ++gboolean ++status_icon_activate_cb (NMApplet *applet) ++#else + static void + status_icon_activate_cb (GtkStatusIcon *icon, NMApplet *applet) ++#endif + { + /* Have clicking on the applet act also as acknowledgement + * of the notification. + */ +- + nma_menu_clear (applet); ++#ifdef ENABLE_INDICATOR ++ nma_menu_show_cb (applet->menu, applet); ++ nma_menu_add_separator_item (applet->menu); ++ applet->menu = nma_context_menu_create (applet, GTK_MENU_SHELL(applet->menu)); ++ nma_context_menu_update (applet); ++ app_indicator_set_menu (applet->status_icon, GTK_MENU(applet->menu)); ++ applet->menu_update_id = 0; ++ return FALSE; ++#else + gtk_menu_popup (GTK_MENU (applet->menu), NULL, NULL, + gtk_status_icon_position_menu, icon, + 1, gtk_get_current_event_time ()); ++#endif + } + ++#ifndef ENABLE_INDICATOR + static void + status_icon_popup_menu_cb (GtkStatusIcon *icon, + guint button, +@@ -3030,32 +3276,48 @@ + gtk_status_icon_position_menu, icon, + button, activate_time); + } ++#endif + + static gboolean + setup_widgets (NMApplet *applet) + { + g_return_val_if_fail (NM_IS_APPLET (applet), FALSE); + ++#ifdef ENABLE_INDICATOR ++ applet->status_icon = app_indicator_new ++ ("nm-applet", "nm-no-connection", ++ APP_INDICATOR_CATEGORY_SYSTEM_SERVICES); ++#else + applet->status_icon = gtk_status_icon_new (); ++#endif + if (!applet->status_icon) + return FALSE; + + g_signal_connect (applet->status_icon, "notify::screen", + G_CALLBACK (status_icon_screen_changed_cb), applet); ++#ifndef ENABLE_INDICATOR + g_signal_connect (applet->status_icon, "size-changed", + G_CALLBACK (status_icon_size_changed_cb), applet); + g_signal_connect (applet->status_icon, "activate", + G_CALLBACK (status_icon_activate_cb), applet); + g_signal_connect (applet->status_icon, "popup-menu", + G_CALLBACK (status_icon_popup_menu_cb), applet); ++#endif + + applet->menu = nma_menu_create (applet); + if (!applet->menu) + return FALSE; + ++#ifdef ENABLE_INDICATOR ++ applet->menu = nma_context_menu_create (applet, GTK_MENU_SHELL(applet->menu)); ++ nma_context_menu_update(applet); ++ ++ app_indicator_set_menu(applet->status_icon, GTK_MENU(applet->menu)); ++#else + applet->context_menu = nma_context_menu_create (applet); + if (!applet->context_menu) + return FALSE; ++#endif + + return TRUE; + } +@@ -3124,6 +3386,7 @@ + g_main_loop_quit (applet->loop); + } + ++#ifndef ENABLE_INDICATOR + static void + applet_embedded_cb (GObject *object, GParamSpec *pspec, gpointer user_data) + { +@@ -3132,6 +3395,7 @@ + g_message ("applet now %s the notification area", + embedded ? "embedded in" : "removed from"); + } ++#endif + + static GObject * + constructor (GType type, +@@ -3174,11 +3438,6 @@ + GCONF_CLIENT_PRELOAD_ONELEVEL, + NULL); + +- /* Load pixmaps and create applet widgets */ +- if (!setup_widgets (applet)) +- goto error; +- nma_icons_init (applet); +- + if (!notify_is_initted ()) + notify_init ("NetworkManager"); + +@@ -3223,18 +3482,25 @@ + + foo_client_setup (applet); + ++ /* Load pixmaps and create applet widgets */ ++ if (!setup_widgets (applet)) ++ goto error; ++ nma_icons_init (applet); ++ + /* timeout to update connection timestamps every 5 minutes */ + applet->update_timestamps_id = g_timeout_add_seconds (300, + (GSourceFunc) periodic_update_active_connection_timestamps, applet); + + nm_gconf_set_pre_keyring_callback (applet_pre_keyring_callback, applet); + ++#ifndef ENABLE_INDICATOR + /* Track embedding to help debug issues where user has removed the + * notification area applet from the panel, and thus nm-applet too. + */ + g_signal_connect (applet->status_icon, "notify::embedded", + G_CALLBACK (applet_embedded_cb), NULL); + applet_embedded_cb (G_OBJECT (applet->status_icon), NULL, NULL); ++#endif + + applet->notify_actions = applet_notify_server_has_actions (); + +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet.h +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/applet.h 2011-01-17 12:18:41.771407881 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet.h 2011-01-17 12:18:41.941407881 -0500 +@@ -38,6 +38,10 @@ + + #include + ++#if ENABLE_INDICATOR ++#include ++#endif ++ + #include + #include + #include +@@ -143,7 +147,12 @@ + guint animation_id; + + /* Direct UI elements */ ++#if ENABLE_INDICATOR ++ AppIndicator *status_icon; ++ guint menu_update_id; ++#else + GtkStatusIcon * status_icon; ++#endif + int icon_size; + + GtkWidget * menu; +@@ -196,7 +205,11 @@ + NMDeviceStateReason reason, + NMApplet *applet); + ++#if ENABLE_INDICATOR ++ gboolean (*get_icon) (NMDevice *device, ++#else + GdkPixbuf * (*get_icon) (NMDevice *device, ++#endif + NMDeviceState state, + NMConnection *connection, + char **tip, +@@ -224,6 +237,10 @@ + + void applet_schedule_update_icon (NMApplet *applet); + ++#ifdef ENABLE_INDICATOR ++gboolean status_icon_activate_cb (NMApplet *applet); ++#endif ++ + NMSettingsInterface *applet_get_settings (NMApplet *applet); + + GSList *applet_get_all_connections (NMApplet *applet); +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/gconf-helpers/Makefile.am +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/gconf-helpers/Makefile.am 2010-12-09 09:51:28.000000000 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/gconf-helpers/Makefile.am 2011-01-17 12:18:41.941407881 -0500 +@@ -12,6 +12,7 @@ + + libgconf_helpers_la_CPPFLAGS = \ + $(NMA_CFLAGS) \ ++ $(APPINDICATOR_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + -I${top_srcdir}/src \ + -I${top_builddir}/src/marshallers \ +@@ -19,6 +20,7 @@ + + libgconf_helpers_la_LIBADD = \ + $(NMA_LIBS) \ ++ $(APPINDICATOR_LIBS) \ + ${top_builddir}/src/marshallers/libmarshallers.la \ + ${top_builddir}/src/utils/libutils.la + +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/mobile-helpers.c +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/mobile-helpers.c 2010-12-09 09:51:28.000000000 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/mobile-helpers.c 2011-01-17 12:18:41.941407881 -0500 +@@ -21,6 +21,7 @@ + */ + + #include "mobile-helpers.h" ++#include + + GdkPixbuf * + mobile_helper_get_status_pixbuf (guint32 quality, +@@ -35,7 +36,11 @@ + + if (!quality_valid) + quality = 0; ++#ifndef ENABLE_INDICATOR + qual_pixbuf = mobile_helper_get_quality_icon (quality, applet); ++#else ++ qual_pixbuf = wwan_pixbuf; ++#endif + + pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + TRUE, +@@ -80,9 +85,14 @@ + return pixbuf; + } + ++#ifndef ENABLE_INDICATOR + GdkPixbuf * ++#else ++char * ++#endif + mobile_helper_get_quality_icon (guint32 quality, NMApplet *applet) + { ++#ifndef ENABLE_INDICATOR + if (quality > 80) + return nma_icon_check_and_load ("nm-signal-100", &applet->wireless_100_icon, applet); + else if (quality > 55) +@@ -93,7 +103,132 @@ + return nma_icon_check_and_load ("nm-signal-25", &applet->wireless_25_icon, applet); + + return nma_icon_check_and_load ("nm-signal-00", &applet->wireless_00_icon, applet); ++#else ++ char *icon_name; ++ ++ if (quality > 80) ++ icon_name = g_strdup_printf ("gsm-3g-full"); ++ else if (quality > 55) ++ icon_name = g_strdup_printf ("gsm-3g-high"); ++ else if (quality > 30) ++ icon_name = g_strdup_printf ("gsm-3g-medium"); ++ else if (quality > 5) ++ icon_name = g_strdup_printf ("gsm-3g-low"); ++ else ++ icon_name = g_strdup_printf ("gsm-3g-none"); ++ ++ return icon_name; ++#endif ++} ++ ++#ifdef ENABLE_INDICATOR ++static const char * ++get_tech_name (guint32 tech) ++{ ++ switch (tech) { ++ case MB_TECH_1XRTT: ++ return _("CDMA"); ++ case MB_TECH_EVDO_REV0: ++ case MB_TECH_EVDO_REVA: ++ return _("EVDO"); ++ case MB_TECH_GSM: ++ return _("GSM"); ++ case MB_TECH_GPRS: ++ return _("GPRS"); ++ case MB_TECH_EDGE: ++ return _("EDGE"); ++ case MB_TECH_UMTS: ++ return _("UMTS"); ++ case MB_TECH_HSDPA: ++ return _("HSDPA"); ++ case MB_TECH_HSUPA: ++ return _("HSUPA"); ++ case MB_TECH_HSPA: ++ return _("HSPA"); ++ default: ++ break; ++ } ++ return NULL; ++} ++ ++char * ++mobile_helper_get_connection_label (const char *connection_name, ++ const char *provider, ++ guint32 technology, ++ guint32 state) ++{ ++ const char *tech_name; ++ char *desc_string; ++ ++ /* Construct the description string */ ++ tech_name = get_tech_name (technology); ++ switch (state) { ++ default: ++ case MB_STATE_UNKNOWN: ++ desc_string = g_strdup (_("not enabled")); ++ break; ++ case MB_STATE_IDLE: ++ if (connection_name) ++ desc_string = g_strdup (connection_name); ++ else ++ desc_string = g_strdup (_("not registered")); ++ break; ++ case MB_STATE_HOME: ++ if (connection_name) { ++ if (provider && tech_name) ++ desc_string = g_strdup_printf ("%s (%s %s)", connection_name, provider, tech_name); ++ else if (provider || tech_name) ++ desc_string = g_strdup_printf ("%s (%s)", connection_name, provider ? provider : tech_name); ++ else ++ desc_string = g_strdup_printf ("%s", connection_name); ++ } else { ++ if (provider) { ++ if (tech_name) ++ desc_string = g_strdup_printf ("%s %s", provider, tech_name); ++ else ++ desc_string = g_strdup_printf ("%s", provider); ++ } else { ++ if (tech_name) ++ desc_string = g_strdup_printf (_("Home network (%s)"), tech_name); ++ else ++ desc_string = g_strdup_printf (_("Home network")); ++ } ++ } ++ break; ++ case MB_STATE_SEARCHING: ++ if (connection_name) ++ desc_string = g_strdup (connection_name); ++ else ++ desc_string = g_strdup (_("searching")); ++ break; ++ case MB_STATE_DENIED: ++ desc_string = g_strdup (_("registration denied")); ++ break; ++ case MB_STATE_ROAMING: ++ if (connection_name) { ++ if (tech_name) ++ desc_string = g_strdup_printf (_("%s (%s roaming)"), connection_name, tech_name); ++ else ++ desc_string = g_strdup_printf (_("%s (roaming)"), connection_name); ++ } else { ++ if (provider) { ++ if (tech_name) ++ desc_string = g_strdup_printf (_("%s (%s roaming)"), provider, tech_name); ++ else ++ desc_string = g_strdup_printf (_("%s (roaming)"), provider); ++ } else { ++ if (tech_name) ++ desc_string = g_strdup_printf (_("Roaming network (%s)"), tech_name); ++ else ++ desc_string = g_strdup_printf (_("Roaming network")); ++ } ++ } ++ break; ++ } ++ ++ return desc_string; + } ++#endif + + GdkPixbuf * + mobile_helper_get_tech_icon (guint32 tech, NMApplet *applet) +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/mobile-helpers.h +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/mobile-helpers.h 2010-12-09 09:51:28.000000000 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/mobile-helpers.h 2011-01-17 12:18:41.941407881 -0500 +@@ -55,9 +55,20 @@ + guint32 access_tech, + NMApplet *applet); + ++#ifndef ENABLE_INDICATOR + GdkPixbuf *mobile_helper_get_quality_icon (guint32 quality, NMApplet *applet); ++#else ++char *mobile_helper_get_quality_icon (guint32 quality, NMApplet *applet); ++#endif + + GdkPixbuf *mobile_helper_get_tech_icon (guint32 tech, NMApplet *applet); + ++#ifdef ENABLE_INDICATOR ++char *mobile_helper_get_connection_label (const char *connection_name, ++ const char *provider, ++ guint32 technology, ++ guint32 state); ++#endif ++ + #endif /* APPLET_MOBILE_HELPERS_H */ + +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/mb-menu-item.c +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/mb-menu-item.c 2010-12-09 09:51:28.000000000 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/mb-menu-item.c 2011-01-17 12:18:41.941407881 -0500 +@@ -178,11 +178,14 @@ + gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE); + } + ++/* Disabling this for indicators only because it won't build otherwise. */ ++#ifndef ENABLE_INDICATOR + /* And the strength icon, if we have strength information at all */ + if (enabled && strength) { + gtk_image_set_from_pixbuf (GTK_IMAGE (priv->strength), + mobile_helper_get_quality_icon (strength, applet)); + } ++#endif + + return GTK_WIDGET (item); + } --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp295788_xfce_menu_entry.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/lp295788_xfce_menu_entry.patch @@ -0,0 +1,10 @@ +Index: network-manager-applet-0.8.1+git.20101012t222209.f7588d8/nm-connection-editor.desktop.in +=================================================================== +--- network-manager-applet-0.8.1+git.20101012t222209.f7588d8.orig/nm-connection-editor.desktop.in 2010-10-12 23:51:12.000000000 -0400 ++++ network-manager-applet-0.8.1+git.20101012t222209.f7588d8/nm-connection-editor.desktop.in 2010-10-12 23:55:50.929562998 -0400 +@@ -10,4 +10,4 @@ + X-GNOME-Bugzilla-Product=NetworkManager + X-GNOME-Bugzilla-Component=general + Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings; +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;Xfce; --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/applet-dialog-uninited-method.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/applet-dialog-uninited-method.patch @@ -0,0 +1,18 @@ +From: Mathieu Trudel-Lapierre +Subject: Fix possibly uninitialized variable "method" in info dialog. + +Simple fix to silence a GCC error. + +Index: network-manager-applet-0.8.3+git.20110114t131931.fd589a7/src/applet-dialogs.c +=================================================================== +--- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/src/applet-dialogs.c 2011-01-17 14:03:35.858037881 -0500 ++++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/src/applet-dialogs.c 2011-01-17 14:03:53.758037881 -0500 +@@ -328,7 +328,7 @@ + GtkTable *table; + guint32 speed = 0; + char *str; +- const char *iface, *method; ++ const char *iface, *method = NULL; + NMIP4Config *ip4_config; + NMIP6Config *ip6_config; + const GArray *dns; --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/20_use_full_vpn_dialog_service_name_path.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/20_use_full_vpn_dialog_service_name_path.patch @@ -0,0 +1,44 @@ + +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: network-manager-applet-0.8.1~beta3~git.20100601t071733.8665dfe/src/vpn-password-dialog.c +=================================================================== +--- network-manager-applet-0.8.1~beta3~git.20100601t071733.8665dfe.orig/src/vpn-password-dialog.c 2010-06-02 21:27:49.000000000 -0400 ++++ network-manager-applet-0.8.1~beta3~git.20100601t071733.8665dfe/src/vpn-password-dialog.c 2010-06-02 21:59:36.818887979 -0400 +@@ -141,16 +141,6 @@ + service); + gtk_window_present (GTK_WINDOW (dialog)); + g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog); +- } else { +- char *prog_basename; +- +- /* Remove any path component, then reconstruct path to the auth +- * dialog in LIBEXECDIR. +- */ +- prog_basename = g_path_get_basename (prog); +- g_free (prog); +- prog = g_strdup_printf ("%s/%s", LIBEXECDIR, prog_basename); +- g_free (prog_basename); + } + + return prog; +@@ -262,8 +252,8 @@ + g_set_error (&error, + NM_SETTINGS_INTERFACE_ERROR, + NM_SETTINGS_INTERFACE_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; + } + --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp337960_dxteam_notification_icon_names.diff +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/lp337960_dxteam_notification_icon_names.diff @@ -0,0 +1,55 @@ +=== 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.8.1+git.20101012t222209.f7588d8/src/applet-device-gsm.c +=================================================================== +--- network-manager-applet-0.8.1+git.20101012t222209.f7588d8.orig/src/applet-device-gsm.c 2010-10-13 00:01:42.000000000 -0400 ++++ network-manager-applet-0.8.1+git.20101012t222209.f7588d8/src/applet-device-gsm.c 2010-10-13 00:01:46.079563002 -0400 +@@ -416,7 +416,7 @@ + applet_do_notify_with_pref (applet, + str ? str : _("GSM network."), + _("Connection Established"), +- "nm-device-wwan", ++ "notification-gsm-high", + PREF_DISABLE_CONNECTED_NOTIFICATIONS); + } + +Index: network-manager-applet-0.8.1+git.20101012t222209.f7588d8/src/applet-device-wifi.c +=================================================================== +--- network-manager-applet-0.8.1+git.20101012t222209.f7588d8.orig/src/applet-device-wifi.c 2010-10-13 00:01:42.000000000 -0400 ++++ network-manager-applet-0.8.1+git.20101012t222209.f7588d8/src/applet-device-wifi.c 2010-10-13 00:02:44.859563007 -0400 +@@ -1049,7 +1049,7 @@ + applet->notify_actions ? + _("Click on this icon to connect to a wireless network") : + _("Use the network menu 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, +@@ -1257,7 +1257,7 @@ + applet_do_notify_with_pref (applet, + esc_ssid ? esc_ssid : _("(none)"), + _("Connection Established"), +- "nm-device-wireless", ++ "notification-network-wireless-full", + PREF_DISABLE_CONNECTED_NOTIFICATIONS); + g_free (esc_ssid); + } +Index: network-manager-applet-0.8.1+git.20101012t222209.f7588d8/src/applet-device-wired.c +=================================================================== +--- network-manager-applet-0.8.1+git.20101012t222209.f7588d8.orig/src/applet-device-wired.c 2010-10-13 00:01:42.000000000 -0400 ++++ network-manager-applet-0.8.1+git.20101012t222209.f7588d8/src/applet-device-wired.c 2010-10-13 00:01:46.089563002 -0400 +@@ -270,7 +270,7 @@ + applet_do_notify_with_pref (applet, + str ? str : _("Wired network"), + _("Connection Established"), +- "nm-device-wired", ++ "notification-network-ethernet-connected", + PREF_DISABLE_CONNECTED_NOTIFICATIONS); + } + } --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp460144_correctly_update_notification.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/lp460144_correctly_update_notification.patch @@ -0,0 +1,75 @@ +Index: network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet.c +=================================================================== +--- network-manager-applet-0.8.3+git.20101209t081952.0330eca.orig/src/applet.c 2010-12-09 10:00:58.294885810 -0500 ++++ network-manager-applet-0.8.3+git.20101209t081952.0330eca/src/applet.c 2010-12-09 10:01:18.874885810 -0500 +@@ -582,17 +582,6 @@ + return item; + } + +-static void +-applet_clear_notify (NMApplet *applet) +-{ +- if (applet->notification == NULL) +- return; +- +- notify_notification_close (applet->notification, NULL); +- g_object_unref (applet->notification); +- applet->notification = NULL; +-} +- + static gboolean + applet_notify_server_has_actions (void) + { +@@ -634,19 +623,28 @@ + if (!gtk_status_icon_is_embedded (applet->status_icon)) + return; + +- applet_clear_notify (applet); +- + escaped = utils_escape_notify_message (message); +- notify = notify_notification_new (summary, +- escaped, +- icon ? icon : GTK_STOCK_NETWORK ++ ++ if (applet->notification == NULL) { ++ notify = notify_notification_new (summary, ++ escaped, ++ icon ? icon : GTK_STOCK_NETWORK + #if HAVE_LIBNOTIFY_07 +- ); ++ ); + #else +- , NULL); ++ , NULL); + #endif ++ ++ applet->notification = notify; ++ } else { ++ notify = applet->notification; ++ notify_notification_update (notify, ++ summary, ++ escaped, ++ icon ? icon : GTK_STOCK_NETWORK); ++ } ++ + g_free (escaped); +- applet->notification = notify; + + #if !HAVE_LIBNOTIFY_07 + notify_notification_attach_to_status_icon (notify, applet->status_icon); +@@ -3005,7 +3003,6 @@ + /* Have clicking on the applet act also as acknowledgement + * of the notification. + */ +- applet_clear_notify (applet); + + nma_menu_clear (applet); + gtk_menu_popup (GTK_MENU (applet->menu), NULL, NULL, +@@ -3022,7 +3019,6 @@ + /* Have clicking on the applet act also as acknowledgement + * of the notification. + */ +- applet_clear_notify (applet); + + nma_context_menu_update (applet); + gtk_menu_popup (GTK_MENU (applet->context_menu), NULL, NULL, --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp289466_always_show_tray_icon.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/lp289466_always_show_tray_icon.patch @@ -0,0 +1,35 @@ +=== modified file 'src/applet.c' +--- + src/applet.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +Index: network-manager-applet-0.8.1+git.20100809t190028.290dc70/src/applet.c +=================================================================== +--- network-manager-applet-0.8.1+git.20100809t190028.290dc70.orig/src/applet.c 2010-08-10 14:47:03.000000000 -0400 ++++ network-manager-applet-0.8.1+git.20100809t190028.290dc70/src/applet.c 2010-08-10 15:13:45.967155252 -0400 +@@ -2232,6 +2232,8 @@ + + if (nm_client_get_manager_running (applet->nm_client)) + g_idle_add (foo_set_initial_state, applet); ++ ++ applet_schedule_update_icon (applet); + } + + static GdkPixbuf * +@@ -2350,6 +2352,8 @@ + out: + if (!pixbuf) + pixbuf = applet_common_get_device_icon (state, applet); ++ if (!pixbuf) ++ pixbuf = applet->no_connection_icon; + return pixbuf; + } + +@@ -2417,7 +2421,6 @@ + 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 */ + --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp358526_generic_disconnected_notification_icon.patch +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/lp358526_generic_disconnected_notification_icon.patch @@ -0,0 +1,27 @@ +--- + src/applet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: network-manager-applet-0.7.1~rc4.1/src/applet.c +=================================================================== +--- network-manager-applet-0.7.1~rc4.1.orig/src/applet.c ++++ network-manager-applet-0.7.1~rc4.1/src/applet.c +@@ -1674,17 +1674,17 @@ + break; + case NM_DEVICE_TYPE_WIFI: + info->icon = "notification-network-wireless-disconnected"; + break; + case NM_DEVICE_TYPE_GSM: + info->icon = "notification-gsm-disconnected"; + break; + default: +- info->icon = "nm-no-connection"; ++ info->icon = "notification-network-disconnected"; + break; + } + g_debug("going for offline with icon: %s", info->icon); + return TRUE; + } + return FALSE; + } + --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/series +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/patches/series @@ -0,0 +1,14 @@ +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 +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 +lp341684_device_sensitive_disconnect_notify.patch +lp358526_generic_disconnected_notification_icon.patch +lp460144_correctly_update_notification.patch +applet-dialog-uninited-method.patch +nm-applet-use-indicator.patch --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/patches/lp337960_dxteam_notification_icon_names_part2-images.diff +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/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 @@ ++ ++ ++image/svg+xml ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ 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.8.3+git.20110114t131931.fd589a7.orig/debian/icons/22/nm-active-device.png.uue +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/icons/22/nm-active-device.png.uue @@ -0,0 +1,13 @@ +begin 644 nm-active-device.png +MB5!.1PT*&@H````-24A$4@````H````*"`8```"-,L^]````!'-"250("`@( +M?`ADB`````EP2%ES```-UP``#=````!ET15AT4V]F='=AY_,EN^SD"?QSB9V)S$6RLA"@5]\X5$VYC_M" +M$K.QI!5++A^L9792\PLI`(#W9N.I>6'[@Y?CP!]4Y+^'?P%$]8OH$@*&^@`` +*``!)14Y$KD)@@@`` +` +end --- network-manager-applet-0.8.3+git.20110114t131931.fd589a7.orig/debian/icons/22/nm-secure-lock.png.uue +++ network-manager-applet-0.8.3+git.20110114t131931.fd589a7/debian/icons/22/nm-secure-lock.png.uue @@ -0,0 +1,11 @@ +begin 644 nm-secure-lock.png +MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[`````7-21T(`KLX< +MZ0````9B2T=$`/\`_P#_H+VGDP````EP2%ES```-UP``#=`````=T +M24U%!]D)$0P3'_FM`,\```#/241!5#C+[=`[BL)0&(;A]\38!-&`*,1&74`8 +MM1DFG3MR*>[&3A%$T<)+:R':3(@S\0+>=8S-*`I6GMCE*;\#+S]'\*_5'7C< +M^2I\""0HUV@JKA,)*WB[-