7 files changed, 87 insertions, 8 deletions

diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
new file mode 100644
index 000000000..b8ba181f5
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch
@@ -0,0 +1,69 @@
+From 023b17f53d888dfb45981b141ce4dc151ab140f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 4 Apr 2013 20:23:00 +0200
+Subject: [PATCH] remove classes and properties which are not supported by
+ gtk+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+unsupported classes caused nm-connection editor to crash
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/connection-editor/ce-page-general.ui      |    7 +------
+ src/connection-editor/nm-connection-editor.ui |    2 +-
+ 2 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui
+index f505c14..a3e8d2b 100644
+--- a/src/connection-editor/ce-page-general.ui
++++ b/src/connection-editor/ce-page-general.ui
+@@ -37,8 +37,6 @@
+       <object class="GtkComboBox" id="dependent_vpn_combo">
+         <property name="visible">True</property>
+         <property name="can_focus">False</property>
+-        <property name="margin_left">26</property>
+-        <property name="margin_bottom">12</property>
+         <property name="model">dependent_vpn_model</property>
+         <child>
+           <object class="GtkCellRendererText" id="renderer1"/>
+@@ -59,7 +57,6 @@
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="receives_default">False</property>
+-        <property name="margin_bottom">12</property>
+         <property name="use_underline">True</property>
+         <property name="xalign">0</property>
+         <property name="draw_indicator">True</property>
+@@ -86,11 +83,9 @@
+       </packing>
+     </child>
+     <child>
+-      <object class="GtkBox" id="box2">
++      <object class="GtkVBox" id="box2">
+         <property name="visible">True</property>
+         <property name="can_focus">False</property>
+-        <property name="valign">start</property>
+-        <property name="vexpand">True</property>
+         <property name="spacing">6</property>
+         <child>
+           <object class="GtkLabel" id="firewall_zone_label">
+diff --git a/src/connection-editor/nm-connection-editor.ui b/src/connection-editor/nm-connection-editor.ui
+index 74ee266..6f1e166 100644
+--- a/src/connection-editor/nm-connection-editor.ui
++++ b/src/connection-editor/nm-connection-editor.ui
+@@ -11,7 +11,7 @@
+     <property name="icon_name">preferences-system-network</property>
+     <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+-      <object class="GtkBox" id="dialog-vbox2">
++      <object class="GtkVBox" id="dialog-vbox2">
+         <property name="visible">True</property>
+         <property name="can_focus">False</property>
+         <property name="orientation">vertical</property>
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png
new file mode 100644
index 000000000..836e723a2
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-100.png b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-100.png
new file mode 100644
index 000000000..def2da969
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-100.png
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png
new file mode 100644
index 000000000..362960b8e
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png
new file mode 100644
index 000000000..1add41dcb
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-75.png b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-75.png
new file mode 100644
index 000000000..6b509e804
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-75.png
diff --git a/meta-gnome/recipes-connectivity/networkmanager/network-manager-applet_0.9.2.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.0.bb
index 85ea5c84c..7dca91c14 100644
--- a/meta-gnome/recipes-connectivity/networkmanager/network-manager-applet_0.9.2.0.bb
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.0.bb
@@ -4,14 +4,21 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 DEPENDS = "gnome-bluetooth polkit-gnome libnotify networkmanager dbus-glib libglade gconf gnome-keyring libgnome-keyring iso-codes"
 
-inherit gnome
+inherit gnome gtk-icon-cache
 
-SRC_URI[archive.md5sum] = "feaf2c8427d23924dde7de52ff4c5078"
-SRC_URI[archive.sha256sum] = "287301692224cc1bb20abe8bc52140461f565e58898a99daef11a188bb29b362"
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI += " \
+    file://0001-remove-classes-and-properties-which-are-not-supporte.patch \
+    file://images/* \
+"
+SRC_URI[archive.md5sum] = "531ce56c51ec86c5d2dc4cbe58649583"
+SRC_URI[archive.sha256sum] = "1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590"
 
 # GTK2.x mode
-EXTRA_OECONF += "--with-gtkver=2 \
-                 --with-bluetooth=yes \
+EXTRA_OECONF += " \
+    --with-gtkver=2 \
+    --with-bluetooth=yes \
 "
 
 do_configure_append() {
@@ -22,13 +29,16 @@ do_configure_append() {
     done
 }
 
+do_install_append() {
+    install -m 0644 ${WORKDIR}/icons/* ${D}/usr/share/icons/hicolor/22x22/apps/
+}
+
 RDEPENDS_${PN} =+ "networkmanager"
 RRECOMMENDS_${PN} =+ "gnome-bluetooth gnome-keyring"
 
-FILES_${PN} += "${datadir}/nm-applet/ \
+FILES_${PN} += " \
+    ${datadir}/nm-applet/ \
     ${datadir}/libnm-gtk/wifi.ui \
-    ${datadir}/gnome-vpn-properties/ \
-    ${datadir}/gnome/autostart/ \
 "
 
 FILES_${PN} += "${libdir}/gnome-bluetooth/plugins/*.so"