[Goodies-commits] r6830 - in gigolo/trunk: . src
Enrico Troeger
enrico at xfce.org
Mon Mar 2 11:48:00 CET 2009
Author: enrico
Date: 2009-03-02 10:48:00 +0000 (Mon, 02 Mar 2009)
New Revision: 6830
Modified:
gigolo/trunk/ChangeLog
gigolo/trunk/src/bookmarkeditdialog.c
gigolo/trunk/src/common.c
Log:
Add a separate service type for Obex connections in the Connect/Bookmark Edit dialogs.
Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog 2009-03-02 10:41:27 UTC (rev 6829)
+++ gigolo/trunk/ChangeLog 2009-03-02 10:48:00 UTC (rev 6830)
@@ -1,3 +1,10 @@
+2009-03-02 Enrico Tröger <enrico(at)xfce(dot)org>
+
+ * src/common.c, src/bookmarkeditdialog.c:
+ Add a separate service type for Obex connections in the
+ Connect/Bookmark Edit dialogs.
+
+
2009-03-01 Enrico Tröger <enrico(at)xfce(dot)org>
* po/POTFILES.in, src/Makefile.am, src/backendgvfs.c,
Modified: gigolo/trunk/src/bookmarkeditdialog.c
===================================================================
--- gigolo/trunk/src/bookmarkeditdialog.c 2009-03-02 10:41:27 UTC (rev 6829)
+++ gigolo/trunk/src/bookmarkeditdialog.c 2009-03-02 10:48:00 UTC (rev 6830)
@@ -101,7 +101,8 @@
SHOW_SHARE = 0x00000010,
SHOW_PORT = 0x00000020,
SHOW_USER = 0x00000040,
- SHOW_DOMAIN = 0x00000080
+ SHOW_DOMAIN = 0x00000080,
+ SHOW_DEVICE = 0x00000100
};
enum {
@@ -117,6 +118,7 @@
SCHEME_SMB,
SCHEME_DAV,
SCHEME_DAVS,
+ SCHEME_OBEX,
SCHEME_CUSTOM
};
@@ -126,6 +128,7 @@
{ "smb", 0, SHOW_SHARE | SHOW_USER | SHOW_DOMAIN },
{ "dav", 80, SHOW_PORT | SHOW_USER },
{ "davs", 443, SHOW_PORT | SHOW_USER },
+ { "obex", 0, SHOW_DEVICE },
{ NULL, 0, 0 }
};
static guint methods_len = G_N_ELEMENTS(methods);
@@ -359,7 +362,21 @@
}
tmp = gigolo_bookmark_get_host(priv->bookmark_init);
if (tmp != NULL)
- gtk_entry_set_text(GTK_ENTRY(priv->server_entry), tmp);
+ {
+ gchar *server;
+ if (tmp[0] == '[' && gigolo_str_equal("obex", gigolo_bookmark_get_scheme(priv->bookmark_init)))
+ {
+ gsize len = strlen(tmp);
+ /* tmp is something like [00:00:00:00:00] and we want to strip the brackets */
+ server = g_strndup(tmp + 1, len - 2);
+ }
+ else
+ server = (gchar *) tmp;
+
+ gtk_entry_set_text(GTK_ENTRY(priv->server_entry), server);
+ if (tmp != server)
+ g_free(server);
+ }
user = gigolo_bookmark_get_user_unescaped(priv->bookmark_init);
if (user != NULL)
{
@@ -458,6 +475,11 @@
}
else
{
+ if (meth->flags & SHOW_DEVICE)
+ gtk_label_set_text_with_mnemonic(GTK_LABEL(priv->server_label), _("_Device:"));
+ else
+ gtk_label_set_text_with_mnemonic(GTK_LABEL(priv->server_label), _("_Server:"));
+
gtk_misc_set_alignment(GTK_MISC(priv->server_label), 0.0, 0.5);
gtk_widget_show(priv->server_label);
gtk_table_attach(GTK_TABLE(table), priv->server_label,
@@ -488,10 +510,9 @@
i++;
}
-
}
- if (meth->flags)
+ if (meth->flags & (SHOW_PORT | SHOW_DOMAIN | SHOW_USER))
{
gtk_misc_set_alignment(GTK_MISC(priv->information_label), 0.0, 0.5);
gtk_widget_show(priv->information_label);
@@ -648,6 +669,23 @@
{
gigolo_bookmark_set_uri(priv->bookmark_update, gtk_entry_get_text(GTK_ENTRY(priv->uri_entry)));
}
+ else if (idx == SCHEME_OBEX)
+ {
+ gchar *server;
+
+ gigolo_bookmark_set_scheme(priv->bookmark_update, methods[idx].scheme);
+
+ tmp = gtk_entry_get_text(GTK_ENTRY(priv->server_entry));
+
+ if (tmp[0] != '[')
+ server = g_strconcat("[", tmp, "]", NULL);
+ else
+ server = (gchar *) tmp;
+
+ gigolo_bookmark_set_host(priv->bookmark_update, server);
+ if (tmp != server)
+ g_free(server);
+ }
else
{
gigolo_bookmark_set_scheme(priv->bookmark_update, methods[idx].scheme);
Modified: gigolo/trunk/src/common.c
===================================================================
--- gigolo/trunk/src/common.c 2009-03-02 10:41:27 UTC (rev 6829)
+++ gigolo/trunk/src/common.c 2009-03-02 10:48:00 UTC (rev 6830)
@@ -80,8 +80,7 @@
else if (gigolo_str_equal(scheme, "sftp"))
return _("SSH");
else if (gigolo_str_equal(scheme, "obex"))
- /* TODO find something better */
- return _("OBEX");
+ return _("Obex");
else if (gigolo_str_equal(scheme, "dav"))
return _("WebDAV");
else if (gigolo_str_equal(scheme, "davs"))
More information about the Goodies-commits
mailing list