[meego-commits] 23811: Changes to MeeGo:1.1:Netbook:Update:Testing/meego-panel-networks

[Ying An Deng]

Hi,
I have made the following changes to meego-panel-networks in project MeeGo:1.1:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
Ying An Deng

[This message was auto-generated]

---

Request #23811:

  submit:   home:yingan:branches:MeeGo:1.1:Netbook:Update:Testing/meego-panel-networks(r3)(cleanup) -> MeeGo:1.1:Netbook:Update:Testing/meego-panel-networks


Message:
    Fix bug BMC# 22511

State:   new          2011-09-07T18:19:12 yingan
Comment: None



changes files:
--------------
--- meego-panel-networks.changes
+++ meego-panel-networks.changes
@@ -0,0 +1,3 @@
+* Wed Aug 30 2011 Deng Ying An <ying.an.deng at intel.com> - 1.3.2
+- Fix BMC# 22511
+

new:
----
  show-delete-failure-connection.patch

spec files:
-----------
--- meego-panel-networks.spec
+++ meego-panel-networks.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.21
+# Generated by: spectacle version 0.22
 # 
 # >> macros
 # << macros
@@ -16,6 +16,7 @@
 Source100:  meego-panel-networks.yaml
 Patch0:     service-type-fixed-string.patch
 Patch1:     meego-panel-networks_backport.patch
+Patch2:     show-delete-failure-connection.patch
 Requires:   mobile-broadband-provider-info
 Requires:   iso-codes
 Requires:   connman >= 0.69
@@ -48,6 +49,8 @@
 %patch0 -p1
 # meego-panel-networks_backport.patch
 %patch1 -p1
+# show-delete-failure-connection.patch
+%patch2 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ meego-panel-networks.yaml
--- meego-panel-networks.yaml
+++ meego-panel-networks.yaml
@@ -9,7 +9,7 @@
 Patches:
     - service-type-fixed-string.patch
     - meego-panel-networks_backport.patch
-
+    - show-delete-failure-connection.patch
 Sources:
     - "%{name}-%{version}.tar.gz"
 Description: meego-panel-networks is a connection management panel for Mutter-Meego.

++++++ show-delete-failure-connection.patch (new)
--- show-delete-failure-connection.patch
+++ show-delete-failure-connection.patch
+diff -aurN meego-panel-networks-1.3.2/carrick/carrick-service-item.c meego-panel-networks-1.3.2.mod/carrick/carrick-service-item.c
+--- meego-panel-networks-1.3.2/carrick/carrick-service-item.c	2011-09-02 14:28:19.999492902 +0800
++++ meego-panel-networks-1.3.2.mod/carrick/carrick-service-item.c	2011-09-02 14:31:26.784763393 +0800
+@@ -534,15 +534,15 @@
+       if (g_strcmp0 (priv->type, "ethernet") != 0 &&
+           g_strcmp0 (priv->type, "vpn") != 0)
+         {
+-          gtk_widget_hide (GTK_WIDGET (priv->delete_button));
++          gtk_widget_show (GTK_WIDGET (priv->delete_button));
+           gtk_widget_set_sensitive (GTK_WIDGET (priv->delete_button),
+-                                    FALSE);
++                                    TRUE);
+         }
+       else
+         {
+-          gtk_widget_show (GTK_WIDGET (priv->delete_button));
++          gtk_widget_hide (GTK_WIDGET (priv->delete_button));
+           gtk_widget_set_sensitive (GTK_WIDGET (priv->delete_button),
+-                                    TRUE);
++                                    FALSE);
+         }
+ 
+       button = g_strdup (_ ("Connect"));