[network-manager-applet] applet/editor: set max-width-chars on labels to prevent wide dialogs

[Dan Williams <dcbw src gnome org>]

commit 7c5b4bd57db91b85a384ec16f503161bb8b35aaf
Author: Dan Williams <dcbw redhat com>
Date:   Wed Apr 9 10:02:13 2014 -0500

    applet/editor: set max-width-chars on labels to prevent wide dialogs
    
    GTK+ 3.10 and lower capped labels with wrapping set, but without
    max-width-chars set, from taking up the entire screen width.  GTK+
    git master no longer does that, so some of our labels never wrap
    and the dialogs look ugly.
    
    Noticed by Michael Biebl
    
    GTK+ 3.10 hack:
    https://git.gnome.org/browse/gtk+/commit/?h=gtk-3-10&id=2436627eb4644234a9e577538ec334d224e3d2be

 src/connection-editor/ce-new-connection.ui |    6 ++++--
 src/libnm-gtk/wifi.ui                      |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/src/connection-editor/ce-new-connection.ui b/src/connection-editor/ce-new-connection.ui
index 1aa1cc2..3b6444b 100644
--- a/src/connection-editor/ce-new-connection.ui
+++ b/src/connection-editor/ce-new-connection.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="new_connection_combo_model">
     <columns>
       <!-- column-name name -->
@@ -83,7 +84,7 @@
                 <property name="can_focus">False</property>
                 <property name="yalign">0</property>
                 <property name="stock">gtk-dialog-question</property>
-                <property name="icon-size">6</property>
+                <property name="icon_size">6</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -122,6 +123,7 @@
 
 If you are creating a VPN, and the VPN connection you wish to create does not appear in the list, you may 
not have the correct VPN plugin installed.</property>
                     <property name="wrap">True</property>
+                    <property name="max_width_chars">60</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/src/libnm-gtk/wifi.ui b/src/libnm-gtk/wifi.ui
index 4dd770d..7b96f88 100644
--- a/src/libnm-gtk/wifi.ui
+++ b/src/libnm-gtk/wifi.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkListStore" id="model1">
     <columns>
       <!-- column-name gchararray -->
@@ -34,7 +35,7 @@
         <property name="can_focus">False</property>
         <property name="yalign">0</property>
         <property name="icon_name">network-wireless</property>
-        <property name="icon-size">6</property>
+        <property name="icon_size">6</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -54,6 +55,7 @@
             <property name="xalign">0</property>
             <property name="use_markup">True</property>
             <property name="wrap">True</property>
+            <property name="max_width_chars">50</property>
           </object>
           <packing>
             <property name="expand">True</property>