[network-manager-netbook: 15/17] Merge remote branch 'awafaa/master'

[Dan Williams <dcbw src gnome org>]

commit 79e903bd7c2458768b95542f69bed4606bdcaf45
Merge: f0abb26 3756466
Author: Dan Williams <dcbw redhat com>
Date:   Wed Nov 3 12:01:35 2010 -0500

    Merge remote branch 'awafaa/master'
    
    Fixups for Meego and other build issues

 AUTHORS                                      |    3 +
 INSTALL                                      |    2 +-
 Makefile.am                                  |    4 +-
 com.meego.UX.Shell.Panels.network.service.in |    3 +
 configure.in                                 |    2 +-
 network-manager-netbook.css.in               |   60 +++++++++++++-------------
 network-manager-netbook.desktop.in           |   17 +++++--
 src/nmn-applet.c                             |   41 +++++++++---------
 src/nmn-panel-client.c                       |    2 +-
 src/nmn-panel-client.h                       |    2 +-
 10 files changed, 75 insertions(+), 61 deletions(-)
---
diff --cc AUTHORS
index 14e8dfb,6db8c83..f4d8f89
--- a/AUTHORS
+++ b/AUTHORS
@@@ -1,1 -1,3 +1,4 @@@
  Tambet Ingo <tambet novell com>
+ Andrew Wafaa <awafaa opensuse org>
+ Bin Li <libin charles gmail com>
++
diff --cc network-manager-netbook.desktop.in
index 7e38d2f,a2cc3f5..e80bc29
--- a/network-manager-netbook.desktop.in
+++ b/network-manager-netbook.desktop.in
@@@ -1,8 -1,15 +1,15 @@@
  [Desktop Entry]
- _Name=network-manager-netbook
- _Comment=Control your network connections
- Icon=nm-device-wireless
- Exec= libexecdir@/network-manager-netbook
- Terminal=false
+ Version=1.0
+ Encoding=UTF-8
  Type=Application
 -Name=network
 -Comment=Network settings
++_Name=network
++_Comment=Network settings
+ Exec=/usr/lib/network-manager-netbook
  OnlyShowIn=MOBLIN;
+ X-GNOME-Autostart-enable=true
+ X-Moblin-Priority=Low
+ X-Moblin-Service=com.meego.UX.Shell.Panels.network
+ X-Moblin-Panel-Optional=false
+ X-Moblin-Panel-Type=applet
+ X-Moblin-Panel-Stylesheet=/usr/share/network-manager-netbook/theme/network-manager-netbook.css
+ X-Moblin-Panel-Button-Style=offline