File gnome-control-center-bnc865632-disable-popup-fo... of Package gnome-control-center.1520

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-control-center-bnc865632-disable-popup-for-NM.patch of Package gnome-control-center.1520

From 5cac9cd93ac74c7f29b4ab9db427120882c4932a Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
Date: Mon, 21 Jul 2014 14:27:28 +0800
Subject: [PATCH] bnc865632 disable popup warnings for NM

---
 panels/network/cc-network-panel.c | 11 ++++++++---
 panels/network/network.ui         | 13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 4fa3706..30e6d3f 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -1282,9 +1282,6 @@ panel_check_network_manager_version (CcNetworkPanel *panel)
         /* is it too new or old */
         if (major > 0 || major > 9 || (minor <= 8 && micro < 992)) {
                 ret = FALSE;
-
-                /* do modal dialog in idle so we don't block startup */
-                panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
         }
 
         g_strfreev (split);
@@ -1342,6 +1339,14 @@ on_toplevel_map (GtkWidget      *widget,
         } else {
                 /* just select the proxy settings */
                 select_first_device (panel);
+
+                GtkWidget *w;
+                w = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
+                                                        "devices_toolbar"));
+                gtk_widget_hide (w);
+                w = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
+                                                        "label_NM_warning"));
+                gtk_widget_show (w);
         }
 }
 
diff --git a/panels/network/network.ui b/panels/network/network.ui
index 212b1a6..0985737 100644
--- a/panels/network/network.ui
+++ b/panels/network/network.ui
@@ -171,6 +171,19 @@
                         <property name="position">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="label_NM_warning">
+                        <property name="visible">False</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Please use YaST2 to configure your network.</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
-- 
1.7.12.4

Places

File gnome-control-center-bnc865632-disable-popup-for-NM.patch of Package gnome-control-center.1520

Places