[Goodies-commits] r7004 - in gigolo/trunk: . src
Enrico Troeger
enrico at xfce.org
Thu Mar 26 19:25:34 CET 2009
Author: enrico
Date: 2009-03-26 18:25:34 +0000 (Thu, 26 Mar 2009)
New Revision: 7004
Modified:
gigolo/trunk/ChangeLog
gigolo/trunk/src/backendgvfs.c
gigolo/trunk/src/bookmark.c
gigolo/trunk/src/bookmark.h
gigolo/trunk/src/browsenetworkpanel.c
gigolo/trunk/src/common.c
gigolo/trunk/src/common.h
gigolo/trunk/src/main.c
gigolo/trunk/src/main.h
gigolo/trunk/src/settings.c
gigolo/trunk/src/window.c
Log:
Refactor some code.
Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/ChangeLog 2009-03-26 18:25:34 UTC (rev 7004)
@@ -9,6 +9,11 @@
Improve extracting the share name of an URI.
Extract also domain names from usernames (e.g.
"smb://mydomain;myusername@host/share").
+ Extract share names only for smb:// URIs.
+ * src/backendgvfs.c, src/bookmark.c, src/bookmark.h,
+ src/browsenetworkpanel.c, src/common.c, src/common.h, src/main.c,
+ src/main.h, src/settings.c, src/window.c:
+ Refactor some code.
2009-03-22 Enrico Tröger <enrico(at)xfce(dot)org>
Modified: gigolo/trunk/src/backendgvfs.c
===================================================================
--- gigolo/trunk/src/backendgvfs.c 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/src/backendgvfs.c 2009-03-26 18:25:34 UTC (rev 7004)
@@ -26,7 +26,6 @@
#include "common.h"
#include "backendgvfs.h"
#include "mountoperation.h"
-#include "main.h"
typedef struct _GigoloBackendGVFSPrivate GigoloBackendGVFSPrivate;
Modified: gigolo/trunk/src/bookmark.c
===================================================================
--- gigolo/trunk/src/bookmark.c 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/src/bookmark.c 2009-03-26 18:25:34 UTC (rev 7004)
@@ -25,7 +25,6 @@
#include "bookmark.h"
#include "common.h"
-#include "main.h"
typedef struct _GigoloBookmarkPrivate GigoloBookmarkPrivate;
@@ -53,9 +52,9 @@
G_DEFINE_TYPE(GigoloBookmark, gigolo_bookmark, G_TYPE_OBJECT);
-static void bookmark_clear(GigoloBookmark *self)
+void gigolo_bookmark_bookmark_clear(GigoloBookmark *bookmark)
{
- GigoloBookmarkPrivate *priv = GIGOLO_BOOKMARK_GET_PRIVATE(self);
+ GigoloBookmarkPrivate *priv = GIGOLO_BOOKMARK_GET_PRIVATE(bookmark);
g_free(priv->name);
g_free(priv->scheme);
@@ -90,17 +89,17 @@
static void gigolo_bookmark_finalize(GObject *object)
{
- bookmark_clear(GIGOLO_BOOKMARK(object));
+ gigolo_bookmark_bookmark_clear(GIGOLO_BOOKMARK(object));
G_OBJECT_CLASS(gigolo_bookmark_parent_class)->finalize(object);
}
-static gboolean parse_uri(GigoloBookmark *bm, const gchar *uri)
+gboolean gigolo_bookmark_parse_uri(GigoloBookmark *bookmark, const gchar *uri)
{
gchar *s, *t, *x, *end, *tmp;
guint l;
- GigoloBookmarkPrivate *priv = GIGOLO_BOOKMARK_GET_PRIVATE(bm);
+ GigoloBookmarkPrivate *priv = GIGOLO_BOOKMARK_GET_PRIVATE(bookmark);
priv->scheme = g_uri_parse_scheme(uri);
@@ -108,7 +107,7 @@
if (priv->scheme == NULL || s == NULL)
{
verbose("Error parsing URI '%s' while reading URI scheme", uri);
- bookmark_clear(bm);
+ gigolo_bookmark_bookmark_clear(bookmark);
return FALSE;
}
s += 3;
@@ -136,7 +135,7 @@
if (l == 0)
{
verbose("Error parsing URI '%s' while reading username", uri);
- bookmark_clear(bm);
+ gigolo_bookmark_bookmark_clear(bookmark);
return FALSE;
}
tmp = g_strndup(s, l);
@@ -164,7 +163,7 @@
if (! hostend || hostend > end)
{
verbose("Error parsing URI '%s', missing ']'", uri);
- bookmark_clear(bm);
+ gigolo_bookmark_bookmark_clear(bookmark);
return FALSE;
}
l = 0;
@@ -209,7 +208,7 @@
priv->port = (guint) atoi(tmp);
g_free(tmp);
}
- if (NZV(end) && *end == '/')
+ if (NZV(end) && *end == '/' && gigolo_str_equal("smb", priv->scheme))
{
end++; /* skip the slash */
@@ -229,7 +228,7 @@
static void gigolo_bookmark_init(GigoloBookmark *self)
{
- bookmark_clear(self);
+ gigolo_bookmark_bookmark_clear(self);
}
@@ -245,7 +244,7 @@
GigoloBookmarkPrivate *priv = GIGOLO_BOOKMARK_GET_PRIVATE(bm);
gigolo_bookmark_set_name(bm, name);
- if (! parse_uri(bm, uri))
+ if (! gigolo_bookmark_parse_uri(bm, uri))
priv->is_valid = FALSE;
return bm;
@@ -265,7 +264,7 @@
priv_src = GIGOLO_BOOKMARK_GET_PRIVATE(src);
/* free existing strings and data */
- bookmark_clear(dst);
+ gigolo_bookmark_bookmark_clear(dst);
/* copy from src to dst */
priv_dst->name = g_strdup(priv_src->name);
Modified: gigolo/trunk/src/bookmark.h
===================================================================
--- gigolo/trunk/src/bookmark.h 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/src/bookmark.h 2009-03-26 18:25:34 UTC (rev 7004)
@@ -84,7 +84,10 @@
gboolean gigolo_bookmark_get_should_not_autoconnect (GigoloBookmark *bookmark);
void gigolo_bookmark_set_should_not_autoconnect (GigoloBookmark *bookmark, gboolean should_not_autoconnect);
+gboolean gigolo_bookmark_parse_uri (GigoloBookmark *bookmark, const gchar *uri);
+void gigolo_bookmark_bookmark_clear (GigoloBookmark *bookmark);
+
G_END_DECLS
#endif /* __BOOKMARK_H__ */
Modified: gigolo/trunk/src/browsenetworkpanel.c
===================================================================
--- gigolo/trunk/src/browsenetworkpanel.c 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/src/browsenetworkpanel.c 2009-03-26 18:25:34 UTC (rev 7004)
@@ -26,7 +26,6 @@
#include "common.h"
#include "compat.h"
-#include "main.h"
#include "backendgvfs.h"
#include "settings.h"
#include "bookmark.h"
Modified: gigolo/trunk/src/common.c
===================================================================
--- gigolo/trunk/src/common.c 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/src/common.c 2009-03-26 18:25:34 UTC (rev 7004)
@@ -25,8 +25,8 @@
#include <glib/gi18n.h>
#include "common.h"
-#include "main.h"
+extern gboolean verbose_mode;
const gchar *gigolo_get_application_icon_name(void)
{
@@ -173,3 +173,29 @@
g_free(cmd);
g_free(open_cmd);
}
+
+
+#ifdef DEBUG
+void debug(gchar const *format, ...)
+{
+ va_list args;
+ va_start(args, format);
+ g_logv(G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args);
+ va_end(args);
+}
+#endif
+
+
+void verbose(gchar const *format, ...)
+{
+#ifndef DEBUG
+ if (verbose_mode)
+#endif
+ {
+ va_list args;
+ va_start(args, format);
+ g_logv(G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, format, args);
+ va_end(args);
+ }
+}
+
Modified: gigolo/trunk/src/common.h
===================================================================
--- gigolo/trunk/src/common.h 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/src/common.h 2009-03-26 18:25:34 UTC (rev 7004)
@@ -47,7 +47,15 @@
GIGOLO_WINDOW_REF_TYPE_MOUNT /* mounted volume */
};
+#ifdef DEBUG
+void debug(gchar const *format, ...);
+#else
+# define debug(...)
+#endif
+void verbose(gchar const *format, ...);
+
+
const gchar *gigolo_describe_scheme(const gchar *scheme);
gboolean gigolo_str_equal(const gchar *a, const gchar *b);
Modified: gigolo/trunk/src/main.c
===================================================================
--- gigolo/trunk/src/main.c 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/src/main.c 2009-03-26 18:25:34 UTC (rev 7004)
@@ -28,7 +28,7 @@
#include <string.h>
#include <libintl.h>
-#include "main.h"
+#include "common.h"
#include "settings.h"
#include "bookmark.h"
#include "window.h"
@@ -37,9 +37,9 @@
static gboolean show_version = FALSE;
-static gboolean verbose_mode = FALSE;
static gboolean list_schemes = FALSE;
static gboolean new_instance = FALSE;
+gboolean verbose_mode = FALSE;
static GOptionEntry cli_options[] =
{
@@ -51,31 +51,6 @@
};
-#ifdef DEBUG
-void debug(gchar const *format, ...)
-{
- va_list args;
- va_start(args, format);
- g_logv(G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args);
- va_end(args);
-}
-#endif
-
-
-void verbose(gchar const *format, ...)
-{
-#ifndef DEBUG
- if (verbose_mode)
-#endif
- {
- va_list args;
- va_start(args, format);
- g_logv(G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, format, args);
- va_end(args);
- }
-}
-
-
static void print_supported_schemes(void)
{
const gchar* const *supported;
Modified: gigolo/trunk/src/main.h
===================================================================
--- gigolo/trunk/src/main.h 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/src/main.h 2009-03-26 18:25:34 UTC (rev 7004)
@@ -20,13 +20,5 @@
#ifndef __MAIN_H__
#define __MAIN_H__
-#ifdef DEBUG
-void debug(gchar const *format, ...);
-#else
-# define debug(...)
-#endif
-void verbose(gchar const *format, ...);
-
-
#endif /* __MAIN_H__ */
Modified: gigolo/trunk/src/settings.c
===================================================================
--- gigolo/trunk/src/settings.c 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/src/settings.c 2009-03-26 18:25:34 UTC (rev 7004)
@@ -30,7 +30,6 @@
#include "settings.h"
#include "common.h"
#include "bookmark.h"
-#include "main.h"
typedef struct _GigoloSettingsPrivate GigoloSettingsPrivate;
Modified: gigolo/trunk/src/window.c
===================================================================
--- gigolo/trunk/src/window.c 2009-03-26 18:25:27 UTC (rev 7003)
+++ gigolo/trunk/src/window.c 2009-03-26 18:25:34 UTC (rev 7004)
@@ -38,7 +38,6 @@
#include "backendgvfs.h"
#include "mountdialog.h"
#include "browsenetworkpanel.h"
-#include "main.h"
typedef struct _GigoloWindowPrivate GigoloWindowPrivate;
More information about the Goodies-commits
mailing list