debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use stock GMimeSession by default

Browse source 
Our use of GMimeSession was unneeded boilerplate, and we weren't doing
anything with it.  This simplifies and clarifies that assumption.

If we want to do anything fancier later, the examples in the gmime
source are a reasonable source to work from in defining a new
GMimeSession derivative.

Since GMimeSession is going away in GMime 2.6, though, i don't
recommend using it.
This commit is contained in:
Daniel Kahn Gillmor 2011-06-03 19:57:46 -04:00 committed by Carl Worth
parent d5b4d95024
commit 5143e5e840
5 changed files with 2 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.local
View file

@ -246,7 +246,6 @@ notmuch_client_srcs = \
notmuch-show.c \ notmuch-show.c \
notmuch-tag.c \ notmuch-tag.c \
notmuch-time.c \ notmuch-time.c \
notmuch-gmime-session.c \
query-string.c \ query-string.c \
show-message.c \ show-message.c \
json.c \ json.c \

3
notmuch-client.h
View file

@ -237,7 +237,4 @@ notmuch_config_set_maildir_synchronize_flags (notmuch_config_t *config,
notmuch_bool_t notmuch_bool_t
debugger_is_active (void); debugger_is_active (void);
GType
notmuch_gmime_session_get_type (void);
#endif #endif

49
notmuch-gmime-session.c
View file

@ -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 */

2
notmuch-reply.c
View file

@ -607,7 +607,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
} }
} else if ((STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) { } else if ((STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
if (params.cryptoctx == NULL) { 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"))) if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg")))
fprintf (stderr, "Failed to construct gpg context.\n"); fprintf (stderr, "Failed to construct gpg context.\n");
else else

2
notmuch-show.c
View file

@ -899,7 +899,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
} else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) || } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) ||
(STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) { (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
if (params.cryptoctx == NULL) { 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"))) if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg")))
fprintf (stderr, "Failed to construct gpg context.\n"); fprintf (stderr, "Failed to construct gpg context.\n");
else else