[Goodies-commits] r3578 - xfvnc/trunk/xfvnc

[Brian Tarricone]

Author: kelnos
Date: 2007-11-11 07:10:57 +0000 (Sun, 11 Nov 2007)
New Revision: 3578

Modified:
   xfvnc/trunk/xfvnc/main.c
Log:
pre-select first saved history item, if there is one


Modified: xfvnc/trunk/xfvnc/main.c
===================================================================
--- xfvnc/trunk/xfvnc/main.c	2007-11-09 14:03:47 UTC (rev 3577)
+++ xfvnc/trunk/xfvnc/main.c	2007-11-11 07:10:57 UTC (rev 3578)
@@ -309,12 +309,10 @@
                                    NULL);
 }
 
-/* yes, i know i could use GtkRecentManager and whatnot, but this is
- * just as easy and doesn't require a really recent gtk */
 static gboolean
 load_recent_servers(GtkComboBox *combo)
 {
-    gboolean ret = FALSE;
+    gboolean got_one = FALSE;
     gchar *recent_file = NULL, groupbuf[128], *fullhost;
     XfceRc *rcfile = NULL;
     XfvncRecentServer *rs;
@@ -367,6 +365,7 @@
                            1, rs,
                            -1);
         g_free(fullhost);
+        got_one = TRUE;
     }
     
 out:
@@ -374,7 +373,7 @@
         xfce_rc_close(rcfile);
     g_free(recent_file);
     
-    return ret;
+    return got_one;
 }
 
 static void
@@ -424,7 +423,7 @@
      char **argv)
 {
     GladeXML *gxml;
-    GtkWidget *connect_window, *combo_recent, *entry_host;
+    GtkWidget *connect_window, *combo_recent;
     
     xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
     
@@ -447,13 +446,16 @@
     
     combo_recent = glade_xml_get_widget(gxml, "combo_recent");
     make_text_combo(GTK_COMBO_BOX(combo_recent));
-    load_recent_servers(GTK_COMBO_BOX(combo_recent));
     g_signal_connect(G_OBJECT(combo_recent), "changed",
                      G_CALLBACK(recent_combo_changed), gxml);
+    if(load_recent_servers(GTK_COMBO_BOX(combo_recent))) {
+        gtk_combo_box_set_active(GTK_COMBO_BOX(combo_recent), 0);
+        gtk_widget_grab_focus(glade_xml_get_widget(gxml, "entry_password"));
+    } else {
+        gtk_widget_set_sensitive(combo_recent, FALSE);
+        gtk_widget_grab_focus(glade_xml_get_widget(gxml, "entry_host"));
+    }
     
-    entry_host = glade_xml_get_widget(gxml, "entry_host");
-    gtk_widget_grab_focus(entry_host);
-    
     gtk_main();
     
     g_object_unref(G_OBJECT(gxml));