[gnome-disk-utility/wip/iscsi] iscsi: Rename "Discovery" to "Server"

[David Zeuthen <davidz src gnome org>]

commit d515142cf7be92b172b18bb24c16a684e1f1a95e
Author: David Zeuthen <davidz redhat com>
Date:   Thu Mar 1 12:50:02 2012 -0500

    iscsi: Rename "Discovery" to "Server"
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 data/ui/palimpsest.ui      |    8 ++++----
 src/palimpsest/gduwindow.c |   31 +++++++++++++++++--------------
 2 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/data/ui/palimpsest.ui b/data/ui/palimpsest.ui
index c6574eb..95f28d2 100644
--- a/data/ui/palimpsest.ui
+++ b/data/ui/palimpsest.ui
@@ -1178,7 +1178,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Target Name</property>
+                        <property name="label" translatable="yes">Name</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
@@ -1211,11 +1211,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="iscsitab-discovery-label">
+                      <object class="GtkLabel" id="iscsitab-server-label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Discovery</property>
+                        <property name="label" translatable="yes">Server</property>
                         <style>
                           <class name="dim-label"/>
                         </style>
@@ -1231,7 +1231,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="iscsitab-discovery-value-label">
+                      <object class="GtkLabel" id="iscsitab-server-value-label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index f3ca303..ce21d97 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -2542,7 +2542,7 @@ update_iscsi_target_page (GduWindow *window)
   UDisksiSCSITarget *target;
   UDisksObject *source_object = NULL;
   UDisksiSCSISource *source = NULL;
-  gchar *discovery = NULL;
+  gchar *server = NULL;
 
   target = udisks_object_peek_iscsi_target (window->current_object);
   set_markup (window,
@@ -2563,34 +2563,37 @@ update_iscsi_target_page (GduWindow *window)
       const gchar *mechanism = udisks_iscsi_source_get_mechanism (source);
       if (g_strcmp0 (mechanism, "static") == 0)
         {
-          discovery = g_strdup (_("Statically configured"));
+          server = g_strdup (_("Configured statically"));
         }
       else if (g_strcmp0 (mechanism, "firmware") == 0)
         {
-          discovery = g_strdup (_("Configured in firmware"));
+          server = g_strdup (_("Configured in firmware"));
         }
       else if (g_strcmp0 (mechanism, "sendtargets") == 0)
         {
-          discovery = g_strdup_printf (_("%s (SendTargets protocol)"),
-                                       udisks_iscsi_source_get_address (source));
+          gchar *str = udisks_iscsi_source_dup_address (source);
+          if (g_str_has_suffix (str, ",3260"))
+            str[strlen (str) - (sizeof ",3260" - 1)] = '\0';
+          server = g_strdup_printf (_("%s <span size=\"smaller\">(SendTargets)</span>"), str);
+          g_free (str);
         }
       else if (g_strcmp0 (mechanism, "isns") == 0)
         {
-          discovery = g_strdup_printf (_("%s (iSNS server)"),
-                                       udisks_iscsi_source_get_address (source));
+          server = g_strdup_printf (_("%s <span size=\"smaller\">(iSNS)</span>"),
+                                    udisks_iscsi_source_get_address (source));
         }
       else
         {
-          discovery = g_strdup_printf (_("%s (Mechanism: %s)"),
-                                       mechanism,
-                                       udisks_iscsi_source_get_address (source));
+          server = g_strdup_printf (_("%s (Mechanism: %s)"),
+                                    udisks_iscsi_source_get_address (source),
+                                    mechanism);
         }
     }
   set_markup (window,
-              "iscsitab-discovery-label",
-              "iscsitab-discovery-value-label",
-              discovery, SET_MARKUP_FLAGS_HYPHEN_IF_EMPTY);
-  g_free (discovery);
+              "iscsitab-server-label",
+              "iscsitab-server-value-label",
+              server, SET_MARKUP_FLAGS_HYPHEN_IF_EMPTY);
+  g_free (server);
 
   update_iscsi_connection_details (window);
 }