From c30c267aa16db0fa921cb9e8d832b8c16c5288c7 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 24 Aug 2005 03:14:49 +0000 Subject: Remove the special case for win32, its a bug on all platforms, silly. 2005-08-23 Not Zed * Makefile.am: Remove the special case for win32, its a bug on all platforms, silly. * mail-account-disable.c (mail_account_disable): make signature match usage. svn path=/trunk/; revision=30230 --- plugins/mail-account-disable/ChangeLog | 8 ++++++++ plugins/mail-account-disable/Makefile.am | 11 +++-------- plugins/mail-account-disable/mail-account-disable.c | 7 ++++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/plugins/mail-account-disable/ChangeLog b/plugins/mail-account-disable/ChangeLog index ef98d8cfd2..98a0423d54 100644 --- a/plugins/mail-account-disable/ChangeLog +++ b/plugins/mail-account-disable/ChangeLog @@ -1,3 +1,11 @@ +2005-08-23 Not Zed + + * Makefile.am: Remove the special case for win32, its a bug on all + platforms, silly. + + * mail-account-disable.c (mail_account_disable): make signature + match usage. + 2005-07-13 Tor Lillqvist * Makefile.am (INCLUDES): Remove duplicated line. diff --git a/plugins/mail-account-disable/Makefile.am b/plugins/mail-account-disable/Makefile.am index bd29208a2e..ad0daf1945 100644 --- a/plugins/mail-account-disable/Makefile.am +++ b/plugins/mail-account-disable/Makefile.am @@ -1,10 +1,3 @@ -if OS_WIN32 -NO_UNDEFINED_REQUIRED_LIBS = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) -endif - INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir)/mail \ @@ -18,6 +11,8 @@ plugin_LTLIBRARIES = libmail-account-disable.la libmail_account_disable_la_SOURCES = mail-account-disable.c libmail_account_disable_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -libmail_account_disable_la_LIBADD = $(NO_UNDEFINED_REQUIRED_LIBS) +libmail_account_disable_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-mail-account-disable.eplug.xml diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c index 134bb44b45..56999f33ca 100644 --- a/plugins/mail-account-disable/mail-account-disable.c +++ b/plugins/mail-account-disable/mail-account-disable.c @@ -39,7 +39,7 @@ #define ACCOUNT_DISABLE 0 #define PROXY_LOGOUT 1 -void mail_account_disable (EPopup *ep, EPopupItem *p, char *uri); +void mail_account_disable (EPopup *ep, EPopupItem *p, void *data); void org_gnome_create_mail_account_disable (EPlugin *ep, EMPopupTargetFolder *t); static EPopupItem popup_items[] = { @@ -50,12 +50,13 @@ static EPopupItem popup_items[] = { static void popup_free (EPopup *ep, GSList *items, void *data) { -g_slist_free (items); + g_slist_free (items); } void -mail_account_disable (EPopup *ep, EPopupItem *p, char *uri) +mail_account_disable (EPopup *ep, EPopupItem *p, void *data) { + char *uri = data; EAccount *account; account = mail_config_get_account_by_source_url (uri); -- cgit