[gnome-control-center/new-printers-panel] printers: Remove Printer URI field + little tweak of row spacing

[Marek Kašík <mkasik src gnome org>]

commit 5a737b3063996bb07c276b79342c0ce6d8292be3
Author: Marek Kasik <mkasik redhat com>
Date:   Wed Jan 12 14:33:26 2011 +0100

    printers: Remove Printer URI field + little tweak of row spacing

 panels/printers/cc-printers-panel.c |   19 -------------------
 panels/printers/printers.ui         |   35 ++++-------------------------------
 2 files changed, 4 insertions(+), 50 deletions(-)
---
diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
index 8fcc60d..3340902 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
@@ -135,7 +135,6 @@ printer_selection_changed_cb (GtkTreeSelection *selection,
   gchar                  *reason = NULL;
   gchar                 **printer_reasons = NULL;
   gchar                  *description = NULL;
-  gchar                  *device_uri = NULL;
   gchar                  *location = NULL;
   gchar                  *status = NULL;
   int                     printer_state = 3;
@@ -205,8 +204,6 @@ printer_selection_changed_cb (GtkTreeSelection *selection,
         {
           if (g_strcmp0 (priv->dests[id].options[i].name, "printer-location") == 0)
             location = g_strdup (priv->dests[id].options[i].value);
-          else if (g_strcmp0 (priv->dests[id].options[i].name, "device-uri") == 0)
-            device_uri = g_strdup (priv->dests[id].options[i].value);
           else if (g_strcmp0 (priv->dests[id].options[i].name, "printer-state") == 0)
             printer_state = atoi (priv->dests[id].options[i].value);
           else if (g_strcmp0 (priv->dests[id].options[i].name, "printer-info") == 0)
@@ -302,18 +299,6 @@ printer_selection_changed_cb (GtkTreeSelection *selection,
 
 
       widget = (GtkWidget*)
-        gtk_builder_get_object (priv->builder, "printer-URI-entry");
-
-      if (device_uri)
-        {
-          gtk_entry_set_text (GTK_ENTRY (widget), device_uri);
-          g_free (device_uri);
-        }
-      else
-        gtk_entry_set_text (GTK_ENTRY (widget), none);
-
-
-      widget = (GtkWidget*)
         gtk_builder_get_object (priv->builder, "printer-description-label");
 
       if (description)
@@ -344,10 +329,6 @@ printer_selection_changed_cb (GtkTreeSelection *selection,
       gtk_label_set_text (GTK_LABEL (widget), "");
 
       widget = (GtkWidget*)
-        gtk_builder_get_object (priv->builder, "printer-URI-entry");
-      gtk_entry_set_text (GTK_ENTRY (widget), "");
-
-      widget = (GtkWidget*)
         gtk_builder_get_object (priv->builder, "printer-disable-button");
       gtk_widget_set_sensitive (widget, FALSE);
     }
diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
index 08b87f5..50fadc4 100644
--- a/panels/printers/printers.ui
+++ b/panels/printers/printers.ui
@@ -76,10 +76,10 @@
             <child>
               <object class="GtkTable" id="table1">
                 <property name="visible">True</property>
-                <property name="n_rows">6</property>
+                <property name="n_rows">5</property>
                 <property name="n_columns">2</property>
                 <property name="column_spacing">10</property>
-                <property name="row_spacing">10</property>
+                <property name="row_spacing">15</property>
                 <child>
                   <object class="GtkVBox" id="vbox6">
                     <property name="visible">True</property>
@@ -133,8 +133,8 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">5</property>
-                    <property name="bottom_attach">6</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
                   </packing>
                 </child>
                 <child>
@@ -145,19 +145,6 @@
                     <property name="label" translatable="yes">Share with these users:</property>
                   </object>
                   <packing>
-                    <property name="top_attach">5</property>
-                    <property name="bottom_attach">6</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label8">
-                    <property name="visible">True</property>
-                    <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Printer URI:</property>
-                  </object>
-                  <packing>
                     <property name="top_attach">4</property>
                     <property name="bottom_attach">5</property>
                     <property name="x_options">GTK_FILL</property>
@@ -202,20 +189,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkEntry" id="printer-URI-entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">4</property>
-                    <property name="bottom_attach">5</property>
-                    <property name="y_options">GTK_FILL</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkDrawingArea" id="drawingarea1">
                     <property name="visible">True</property>
                   </object>