summaryrefslogtreecommitdiff
path: root/src/caja-connect-server-dialog.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/caja-connect-server-dialog.c')
-rw-r--r--src/caja-connect-server-dialog.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c
index b068e6b2..921b2597 100644
--- a/src/caja-connect-server-dialog.c
+++ b/src/caja-connect-server-dialog.c
@@ -602,7 +602,7 @@ connect_dialog_connect_to_server (CajaConnectServerDialog *dialog)
uri = g_strdup_printf ("%s://%s%s%s%s%s%s",
meth->scheme,
(user != NULL) ? user : "",
- (user[0] != 0) ? "@" : "",
+ (user != NULL && user[0] != 0) ? "@" : "",
server,
(port_str != NULL) ? ":" : "",
(port_str != NULL) ? port_str : "",
@@ -869,6 +869,7 @@ caja_connect_server_dialog_init (CajaConnectServerDialog *dialog)
label = gtk_label_new (NULL);
str = g_strdup_printf ("<b>%s</b>", _("Server Details"));
gtk_label_set_markup (GTK_LABEL (label), str);
+ g_free (str);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (content_area), label, FALSE, FALSE, 6);
gtk_widget_show (label);
@@ -1042,6 +1043,7 @@ caja_connect_server_dialog_init (CajaConnectServerDialog *dialog)
label = gtk_label_new (NULL);
str = g_strdup_printf ("<b>%s</b>", _("User Details"));
gtk_label_set_markup (GTK_LABEL (label), str);
+ g_free (str);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (content_area), label, FALSE, FALSE, 6);