[libgit2-glib] Port GgitCredSshInteractive to G_DECLARE_DERIVABLE_TYPE macro



commit b239ba847dc230807a7abdb927a26e097b370410
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Jul 25 22:48:13 2015 +0200

    Port GgitCredSshInteractive to G_DECLARE_DERIVABLE_TYPE macro

 libgit2-glib/ggit-autocleanup.h          |    1 -
 libgit2-glib/ggit-cred-ssh-interactive.c |    6 ++++++
 libgit2-glib/ggit-cred-ssh-interactive.h |   19 ++-----------------
 libgit2-glib/ggit-types.h                |    7 -------
 4 files changed, 8 insertions(+), 25 deletions(-)
---
diff --git a/libgit2-glib/ggit-autocleanup.h b/libgit2-glib/ggit-autocleanup.h
index f75bf5e..44c8cb7 100644
--- a/libgit2-glib/ggit-autocleanup.h
+++ b/libgit2-glib/ggit-autocleanup.h
@@ -57,7 +57,6 @@ G_BEGIN_DECLS
 #ifndef __GI_SCANNER__
 #if GLIB_CHECK_VERSION (2, 44, 0)
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitCredSshInteractive, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (GgitRepository, g_object_unref)
 
 #endif /* GLIB_CHECK_VERSION (2, 44, 0) */
diff --git a/libgit2-glib/ggit-cred-ssh-interactive.c b/libgit2-glib/ggit-cred-ssh-interactive.c
index 5612b9d..97f51cf 100644
--- a/libgit2-glib/ggit-cred-ssh-interactive.c
+++ b/libgit2-glib/ggit-cred-ssh-interactive.c
@@ -38,6 +38,12 @@ struct _GgitCredSshInteractivePrompt
        gboolean is_masked;
 };
 
+/**
+ * GgitCredSshInteractive:
+ *
+ * Represents a ssh interactive credential.
+ */
+
 typedef struct _GgitCredSshInteractivePrivate
 {
        gchar *username;
diff --git a/libgit2-glib/ggit-cred-ssh-interactive.h b/libgit2-glib/ggit-cred-ssh-interactive.h
index 4cf22c0..217d6ab 100644
--- a/libgit2-glib/ggit-cred-ssh-interactive.h
+++ b/libgit2-glib/ggit-cred-ssh-interactive.h
@@ -27,25 +27,12 @@
 
 G_BEGIN_DECLS
 
-#define GGIT_TYPE_CRED_SSH_INTERACTIVE         (ggit_cred_ssh_interactive_get_type ())
-#define GGIT_CRED_SSH_INTERACTIVE(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GGIT_TYPE_CRED_SSH_INTERACTIVE, GgitCredSshInteractive))
-#define GGIT_CRED_SSH_INTERACTIVE_CONST(obj)   (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
GGIT_TYPE_CRED_SSH_INTERACTIVE, GgitCredSshInteractive const))
-#define GGIT_CRED_SSH_INTERACTIVE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), 
GGIT_TYPE_CRED_SSH_INTERACTIVE, GgitCredSshInteractiveClass))
-#define GGIT_IS_CRED_SSH_INTERACTIVE(obj)      (G_TYPE_CHECK_INSTANCE_TYPE ((obj), 
GGIT_TYPE_CRED_SSH_INTERACTIVE))
-#define GGIT_IS_CRED_SSH_INTERACTIVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), 
GGIT_TYPE_CRED_SSH_INTERACTIVE))
-#define GGIT_CRED_SSH_INTERACTIVE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), 
GGIT_TYPE_CRED_SSH_INTERACTIVE, GgitCredSshInteractiveClass))
+#define GGIT_TYPE_CRED_SSH_INTERACTIVE (ggit_cred_ssh_interactive_get_type ())
+G_DECLARE_DERIVABLE_TYPE (GgitCredSshInteractive, ggit_cred_ssh_interactive, GGIT, CRED_SSH_INTERACTIVE, 
GgitCred)
 
 #define GGIT_TYPE_CRED_SSH_INTERACTIVE_PROMPT  (ggit_cred_ssh_interactive_prompt_get_type ())
 #define GGIT_CRED_SSH_INTERACTIVE_PROMPT(obj)  ((GgitCredSshInteractivePrompt*)obj)
 
-typedef struct _GgitCredSshInteractiveClass    GgitCredSshInteractiveClass;
-
-struct _GgitCredSshInteractive
-{
-       /*< private >*/
-       GgitCred parent;
-};
-
 struct _GgitCredSshInteractiveClass
 {
        /*< private >*/
@@ -57,8 +44,6 @@ struct _GgitCredSshInteractiveClass
                        gsize                          num_prompts);
 };
 
-GType         ggit_cred_ssh_interactive_get_type      (void) G_GNUC_CONST;
-
 GgitCredSshInteractive *
               ggit_cred_ssh_interactive_new           (const gchar             *username,
                                                        GError                 **error);
diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
index ac799cb..1cc1c0c 100644
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -47,13 +47,6 @@ typedef struct _GgitCloneOptions GgitCloneOptions;
 typedef struct _GgitConfigEntry GgitConfigEntry;
 
 /**
- * GgitCredSshInteractive:
- *
- * Represents a ssh interactive credential.
- */
-typedef struct _GgitCredSshInteractive GgitCredSshInteractive;
-
-/**
  * GgitCredSshInteractivePrompt:
  *
  * Represents a ssh interactive prompt.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]