[libgit2-glib] Use signals for remote callbacks notifications
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgit2-glib] Use signals for remote callbacks notifications
- Date: Tue, 23 Dec 2014 16:59:56 +0000 (UTC)
commit 26a0307a43db425da88e571006a76c5291001e6d
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Tue Dec 23 17:59:33 2014 +0100
Use signals for remote callbacks notifications
examples/clone.c | 7 +-
libgit2-glib/ggit-remote-callbacks.c | 194 +++++++++++-----------------------
libgit2-glib/ggit-remote-callbacks.h | 30 +++---
3 files changed, 77 insertions(+), 154 deletions(-)
---
diff --git a/examples/clone.c b/examples/clone.c
index cc3fe2f..9cd891a 100644
--- a/examples/clone.c
+++ b/examples/clone.c
@@ -25,10 +25,9 @@ cloner_init (Cloner *cloner)
{
}
-static gboolean
+static void
cloner_transfer_progress (GgitRemoteCallbacks *callbacks,
- GgitTransferProgress *stats,
- GError **error)
+ GgitTransferProgress *stats)
{
guint recvobjs;
guint totobjs;
@@ -52,8 +51,6 @@ cloner_transfer_progress (GgitRemoteCallbacks *callbacks,
{
g_printf("\n");
}
-
- return TRUE;
}
static void
diff --git a/libgit2-glib/ggit-remote-callbacks.c b/libgit2-glib/ggit-remote-callbacks.c
index 8e92b44..e266456 100644
--- a/libgit2-glib/ggit-remote-callbacks.c
+++ b/libgit2-glib/ggit-remote-callbacks.c
@@ -22,6 +22,7 @@
#include "ggit-cred.h"
#include "ggit-transfer-progress.h"
#include "ggit-oid.h"
+#include "ggit-enum-types.h"
#define GGIT_REMOTE_CALLBACKS_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object),
GGIT_TYPE_REMOTE_CALLBACKS, GgitRemoteCallbacksPrivate))
@@ -44,8 +45,10 @@ struct _GgitRemoteCallbacksPrivate
enum
{
- UPDATE_TIPS,
+ PROGRESS,
TRANSFER_PROGRESS,
+ UPDATE_TIPS,
+ COMPLETION,
NUM_SIGNALS
};
@@ -74,7 +77,7 @@ ggit_remote_callbacks_class_init (GgitRemoteCallbacksClass *klass)
g_signal_new ("update-tips",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
- 0,
+ G_STRUCT_OFFSET (GgitRemoteCallbacksClass, update_tips),
NULL, NULL,
NULL,
G_TYPE_NONE,
@@ -84,83 +87,39 @@ ggit_remote_callbacks_class_init (GgitRemoteCallbacksClass *klass)
GGIT_TYPE_OID);
signals[TRANSFER_PROGRESS] =
+ g_signal_new ("progress",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GgitRemoteCallbacksClass, progress),
+ NULL, NULL,
+ NULL,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_STRING);
+
+ signals[TRANSFER_PROGRESS] =
g_signal_new ("transfer-progress",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
- 0,
+ G_STRUCT_OFFSET (GgitRemoteCallbacksClass, transfer_progress),
NULL, NULL,
NULL,
G_TYPE_NONE,
1,
GGIT_TYPE_TRANSFER_PROGRESS);
- g_type_class_add_private (object_class, sizeof (GgitRemoteCallbacksPrivate));
-}
-
-static int
-progress_wrap (const char *str, int len, void *data)
-{
- GgitRemoteCallbacks *self = GGIT_REMOTE_CALLBACKS (data);
-
- if (GGIT_REMOTE_CALLBACKS_GET_CLASS (self)->progress != NULL)
- {
- GError *error = NULL;
-
- if (GGIT_REMOTE_CALLBACKS_GET_CLASS (self)->progress (self,
- str,
- len,
- &error))
- {
- return GIT_OK;
- }
- else
- {
- if (error)
- {
- giterr_set_str (GIT_ERROR, error->message);
- g_error_free (error);
- }
-
- return GIT_ERROR;
- }
- }
- else
- {
- return GIT_OK;
- }
-}
-
-static int
-completion_wrap (git_remote_completion_type type, void *data)
-{
- GgitRemoteCallbacks *self = GGIT_REMOTE_CALLBACKS (data);
-
- if (GGIT_REMOTE_CALLBACKS_GET_CLASS (self)->completion != NULL)
- {
- GError *error = NULL;
- GgitRemoteCompletionType rt = (GgitRemoteCompletionType)type;
-
- if (GGIT_REMOTE_CALLBACKS_GET_CLASS (self)->completion (self,
- rt,
- &error))
- {
- return GIT_OK;
- }
- else
- {
- if (error)
- {
- giterr_set_str (GIT_ERROR, error->message);
- g_error_free (error);
- }
+ signals[COMPLETION] =
+ g_signal_new ("completion",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GgitRemoteCallbacksClass, completion),
+ NULL, NULL,
+ NULL,
+ G_TYPE_NONE,
+ 1,
+ GGIT_TYPE_REMOTE_COMPLETION_TYPE);
- return GIT_ERROR;
- }
- }
- else
- {
- return GIT_OK;
- }
+ g_type_class_add_private (object_class, sizeof (GgitRemoteCallbacksPrivate));
}
static int
@@ -213,45 +172,33 @@ credentials_wrap (git_cred **cred,
}
}
+
static int
-transfer_progress_wrap (const git_transfer_progress *stats, void *data)
+progress_wrap (const char *str, int len, void *data)
{
GgitRemoteCallbacks *self = GGIT_REMOTE_CALLBACKS (data);
- GgitTransferProgress *p;
- gint ret;
+ gchar *message;
- p = _ggit_transfer_progress_wrap (stats);
+ message = g_strndup (str, len);
- if (GGIT_REMOTE_CALLBACKS_GET_CLASS (self)->transfer_progress != NULL)
- {
- GError *error = NULL;
+ g_signal_emit (self, signals[PROGRESS], 0, message);
- if (GGIT_REMOTE_CALLBACKS_GET_CLASS (self)->transfer_progress (self,
- p,
- &error))
- {
- ret = GIT_OK;
- }
- else
- {
- if (error)
- {
- giterr_set_str (GIT_ERROR, error->message);
- g_error_free (error);
- }
+ g_free (message);
+ return GIT_OK;
+}
- ret = GIT_ERROR;
- }
- }
- else
- {
- ret = GIT_OK;
- }
+static int
+transfer_progress_wrap (const git_transfer_progress *stats, void *data)
+{
+ GgitRemoteCallbacks *self = GGIT_REMOTE_CALLBACKS (data);
+ GgitTransferProgress *p;
+
+ p = _ggit_transfer_progress_wrap (stats);
- g_signal_emit (self, signals[TRANSFER_PROGRESS], 0, ret == GIT_OK ? p : NULL);
+ g_signal_emit (self, signals[TRANSFER_PROGRESS], 0, p);
ggit_transfer_progress_free (p);
- return ret;
+ return GIT_OK;
}
static int
@@ -263,47 +210,27 @@ update_tips_wrap (const char *refname,
GgitRemoteCallbacks *self = GGIT_REMOTE_CALLBACKS (data);
GgitOId *na;
GgitOId *nb;
- gint ret;
- GError *error = NULL;
na = _ggit_oid_wrap (a);
nb = _ggit_oid_wrap (b);
- if (GGIT_REMOTE_CALLBACKS_GET_CLASS (self)->update_tips != NULL)
- {
- if (GGIT_REMOTE_CALLBACKS_GET_CLASS (self)->update_tips (self,
- refname,
- na,
- nb,
- &error))
- {
- ret = GIT_OK;
- }
- else
- {
- if (error)
- {
- giterr_set_str (GIT_ERROR, error->message);
- g_error_free (error);
- }
-
- ret = GIT_ERROR;
- }
- }
- else
- {
- ret = GIT_OK;
- }
-
- if (ret == GIT_OK)
- {
- g_signal_emit (self, signals[UPDATE_TIPS], 0, refname, na, nb);
- }
+ g_signal_emit (self, signals[UPDATE_TIPS], 0, refname, na, nb);
ggit_oid_free (na);
ggit_oid_free (nb);
- return ret;
+ return GIT_OK;
+}
+
+static int
+completion_wrap (git_remote_completion_type type, void *data)
+{
+ GgitRemoteCallbacks *self = GGIT_REMOTE_CALLBACKS (data);
+ GgitRemoteCompletionType rt = (GgitRemoteCompletionType)type;
+
+ g_signal_emit (self, signals[COMPLETION], 0, rt);
+
+ return GIT_OK;
}
static void
@@ -316,10 +243,11 @@ ggit_remote_callbacks_init (GgitRemoteCallbacks *self)
self->priv->native = gcallbacks;
self->priv->native.sideband_progress = progress_wrap;
- self->priv->native.completion = completion_wrap;
- self->priv->native.credentials = credentials_wrap;
self->priv->native.transfer_progress = transfer_progress_wrap;
self->priv->native.update_tips = update_tips_wrap;
+ self->priv->native.completion = completion_wrap;
+
+ self->priv->native.credentials = credentials_wrap;
self->priv->native.payload = self;
}
diff --git a/libgit2-glib/ggit-remote-callbacks.h b/libgit2-glib/ggit-remote-callbacks.h
index a39c99a..aa77e24 100644
--- a/libgit2-glib/ggit-remote-callbacks.h
+++ b/libgit2-glib/ggit-remote-callbacks.h
@@ -50,16 +50,22 @@ struct _GgitRemoteCallbacksClass
{
GObjectClass parent_class;
- /* virtual methods */
- gboolean (*progress) (GgitRemoteCallbacks *callbacks,
- const gchar *str,
- gint len,
- GError **error);
+ /* signals */
+ void (*progress) (GgitRemoteCallbacks *callbacks,
+ const gchar *message);
- gboolean (*completion) (GgitRemoteCallbacks *callbacks,
- GgitRemoteCompletionType type,
- GError **error);
+ void (*transfer_progress) (GgitRemoteCallbacks *callbacks,
+ GgitTransferProgress *stats);
+
+ void (*update_tips) (GgitRemoteCallbacks *callbacks,
+ const gchar *refname,
+ const GgitOId *a,
+ const GgitOId *b);
+ void (*completion) (GgitRemoteCallbacks *callbacks,
+ GgitRemoteCompletionType type);
+
+ /* virtual methods */
gboolean (*credentials) (GgitRemoteCallbacks *callbacks,
const gchar *url,
const gchar *username_from_url,
@@ -67,15 +73,7 @@ struct _GgitRemoteCallbacksClass
GgitCred **cred,
GError **error);
- gboolean (*transfer_progress) (GgitRemoteCallbacks *callbacks,
- GgitTransferProgress *stats,
- GError **error);
- gboolean (*update_tips) (GgitRemoteCallbacks *callbacks,
- const gchar *refname,
- const GgitOId *a,
- const GgitOId *b,
- GError **error);
};
GType ggit_remote_callbacks_get_type (void) G_GNUC_CONST;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
