diff options
| -rw-r--r-- | Makefile.local | 1 | ||||
| -rw-r--r-- | notmuch-client.h | 3 | ||||
| -rw-r--r-- | notmuch-gmime-session.c | 49 | ||||
| -rw-r--r-- | notmuch-reply.c | 2 | ||||
| -rw-r--r-- | notmuch-show.c | 2 |
5 files changed, 2 insertions, 55 deletions
diff --git a/Makefile.local b/Makefile.local index f726f1f2..8a8832da 100644 --- a/Makefile.local +++ b/Makefile.local @@ -246,7 +246,6 @@ notmuch_client_srcs = \ notmuch-show.c \ notmuch-tag.c \ notmuch-time.c \ - notmuch-gmime-session.c \ query-string.c \ show-message.c \ json.c \ diff --git a/notmuch-client.h b/notmuch-client.h index 8a272603..63be3374 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -237,7 +237,4 @@ notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config, notmuch_bool_t debugger_is_active (void); -GType -notmuch_gmime_session_get_type (void); - #endif diff --git a/notmuch-gmime-session.c b/notmuch-gmime-session.c deleted file mode 100644 index d83d9b3d..00000000 --- a/notmuch-gmime-session.c +++ /dev/null @@ -1,49 +0,0 @@ -#include "notmuch-client.h" - -/* CRUFTY BOILERPLATE for GMimeSession (dkg thinks this will go away once GMime 2.6 comes out) */ -typedef struct _NotmuchGmimeSession NotmuchGmimeSession; -typedef struct _NotmuchGmimeSessionClass NotmuchGmimeSessionClass; - -struct _NotmuchGmimeSession { - GMimeSession parent_object; -}; - -struct _NotmuchGmimeSessionClass { - GMimeSessionClass parent_class; -}; - -static void notmuch_gmime_session_class_init (NotmuchGmimeSessionClass *klass); - -static GMimeSessionClass *parent_class = NULL; - -GType -notmuch_gmime_session_get_type (void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo info = { - sizeof (NotmuchGmimeSessionClass), - NULL, /* base_class_init */ - NULL, /* base_class_finalize */ - (GClassInitFunc) notmuch_gmime_session_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (NotmuchGmimeSession), - 0, /* n_preallocs */ - NULL, /* object_init */ - NULL, /* value_table */ - }; - type = g_type_register_static (GMIME_TYPE_SESSION, "NotmuchGmimeSession", &info, 0); - } - return type; -} - -static void -notmuch_gmime_session_class_init (NotmuchGmimeSessionClass *klass) -{ - GMimeSessionClass *session_class = GMIME_SESSION_CLASS (klass); - parent_class = g_type_class_ref (GMIME_TYPE_SESSION); - session_class->request_passwd = NULL; -} -/* END CRUFTY BOILERPLATE */ diff --git a/notmuch-reply.c b/notmuch-reply.c index 5265af6d..514bbc64 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -607,7 +607,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) } } else if ((STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) { if (params.cryptoctx == NULL) { - GMimeSession* session = g_object_new(notmuch_gmime_session_get_type(), NULL); + GMimeSession* session = g_object_new(g_mime_session_get_type(), NULL); if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg"))) fprintf (stderr, "Failed to construct gpg context.\n"); else diff --git a/notmuch-show.c b/notmuch-show.c index 9267d022..dda83a10 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -899,7 +899,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) || (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) { if (params.cryptoctx == NULL) { - GMimeSession* session = g_object_new(notmuch_gmime_session_get_type(), NULL); + GMimeSession* session = g_object_new(g_mime_session_get_type(), NULL); if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg"))) fprintf (stderr, "Failed to construct gpg context.\n"); else |