commit dec3915e79a5123b105914a25177a33a3e14f641
parent 1775f3635e507f250ea6dddda2fd2dc31f431e64
Author: Jean-Yves Lefort <jylefort@brutele.be>
Date: Mon, 28 Apr 2008 00:56:11 +1000
mail-notification-5.3
* Core changes:
* Compile options are now passed to the C compiler in
the appropriate order, fixing the build with options
such as -Wl,--as-needed (#214450)
* The "connection to the D-Bus session was lost" error
dialog is no longer displayed on logout
* The .desktop files have been improved (#204466)
* IMAP, Maildir and POP3 changes:
* The message caching code introduced in 5.1 sometimes
caused a crash: fixed (#210915)
* Evolution changes:
* A regression introduced in 5.1 caused a crash on
64-bit systems: fixed (#208149)
* Windows Live Hotmail changes:
* Spanish inbox support has been fixed (#214986)
* Updated translations:
* Spanish (Nacho Hermoso de Mendoza)
Diffstat:
41 files changed, 894 insertions(+), 564 deletions(-)
diff --git a/NEWS b/NEWS
@@ -1,3 +1,27 @@
+5.3 April 27, 2008
+
+ * Core changes:
+ * Compile options are now passed to the C compiler in
+ the appropriate order, fixing the build with options
+ such as -Wl,--as-needed (#214450)
+ * The "connection to the D-Bus session was lost" error
+ dialog is no longer displayed on logout
+ * The .desktop files have been improved (#204466)
+
+ * IMAP, Maildir and POP3 changes:
+ * The message caching code introduced in 5.1 sometimes
+ caused a crash: fixed (#210915)
+
+ * Evolution changes:
+ * A regression introduced in 5.1 caused a crash on
+ 64-bit systems: fixed (#208149)
+
+ * Windows Live Hotmail changes:
+ * Spanish inbox support has been fixed (#214986)
+
+ * Updated translations:
+ * Spanish (Nacho Hermoso de Mendoza)
+
5.2 March 20, 2008
* Core changes:
@@ -41,7 +65,6 @@
* IMAP, Maildir, mbox, MH, Mozilla, POP3, Sylpheed, Windows
Live Hotmail and Yahoo! Mail changes:
-
* The GConf setting
/apps/mail-notification/fallback-charsets has been
added. This setting is used when attempting to
@@ -72,7 +95,6 @@
Peter Kjellerstedt)
* Windows Live Hotmail changes:
-
* Account languages other than English are now
supported. Support was added for Brazilian
Portuguese, Danish, Dutch, Finnish, French, German,
diff --git a/build/src/mn-evolution-server.c b/build/src/mn-evolution-server.c
@@ -556,7 +556,7 @@ mn_evolution_server_camel_message_info_to_dbus_struct (CamelMessageInfo * info)
G_TYPE_STRING, camel_message_info_from(info),
/* char *subject */
G_TYPE_STRING, camel_message_info_subject(info),
- 0);
+ (GType) 0);
}}
#line 562 "mn-evolution-server.c"
#undef __GOB_FUNCTION__
diff --git a/build/src/mn-hotmail-mailbox.c b/build/src/mn-hotmail-mailbox.c
@@ -343,7 +343,7 @@ mn_hotmail_mailbox_encode_with_character_references (const char * str)
{
gunichar c = g_utf8_get_char(p);
- if (c < 128 && (g_ascii_isalnum(c) || g_ascii_isspace(c)))
+ if (c < 128 && (g_ascii_isalnum(c) || g_ascii_isspace(c) || c == '.'))
g_string_append_c(encoded, c);
else
g_string_append_printf(encoded, "&#%i;", (int) c);
diff --git a/build/src/mn-mailbox-private.h b/build/src/mn-mailbox-private.h
@@ -42,32 +42,32 @@ struct _MNMailboxPrivate {
gboolean poll;
#line 246 "src/mn-mailbox.gob"
GSList * all_messages;
-#line 249 "src/mn-mailbox.gob"
+#line 255 "src/mn-mailbox.gob"
GHashTable * all_messages_mid_hash_table;
-#line 256 "src/mn-mailbox.gob"
- GHashTable * all_messages_considered_as_read;
#line 262 "src/mn-mailbox.gob"
+ GHashTable * all_messages_considered_as_read;
+#line 268 "src/mn-mailbox.gob"
GHashTable * messages_hash_table;
-#line 1018 "src/mn-mailbox.gob"
+#line 1024 "src/mn-mailbox.gob"
gboolean checking_enabled;
#line 54 "mn-mailbox-private.h"
};
-#line 273 "src/mn-mailbox.gob"
+#line 279 "src/mn-mailbox.gob"
void mn_mailbox_set_messages (MNMailbox * self, GSList * messages);
#line 58 "mn-mailbox-private.h"
-#line 416 "src/mn-mailbox.gob"
+#line 422 "src/mn-mailbox.gob"
void mn_mailbox_set_error (MNMailbox * self, const char * format, ...) G_GNUC_PRINTF(2, 3);
#line 61 "mn-mailbox-private.h"
-#line 1020 "src/mn-mailbox.gob"
+#line 1026 "src/mn-mailbox.gob"
void mn_mailbox_enable_checking (MNMailbox * self);
#line 64 "mn-mailbox-private.h"
-#line 1031 "src/mn-mailbox.gob"
+#line 1037 "src/mn-mailbox.gob"
void mn_mailbox_notice (MNMailbox * self, const char * format, ...) G_GNUC_PRINTF(2, 3);
#line 67 "mn-mailbox-private.h"
-#line 1049 "src/mn-mailbox.gob"
+#line 1055 "src/mn-mailbox.gob"
void mn_mailbox_warning (MNMailbox * self, const char * format, ...) G_GNUC_PRINTF(2, 3);
#line 70 "mn-mailbox-private.h"
-#line 1066 "src/mn-mailbox.gob"
+#line 1072 "src/mn-mailbox.gob"
MNMessage * mn_mailbox_get_message_from_mid (MNMailbox * self, const char * mid);
#line 73 "mn-mailbox-private.h"
diff --git a/build/src/mn-mailbox.c b/build/src/mn-mailbox.c
@@ -96,45 +96,45 @@ static void ___real_mn_mailbox_removed (MNMailbox * self);
#line 234 "src/mn-mailbox.gob"
static void mn_mailbox_update_check_timeout (MNMailbox * self);
#line 99 "mn-mailbox.c"
-#line 291 "src/mn-mailbox.gob"
+#line 297 "src/mn-mailbox.gob"
static void mn_mailbox_filter_messages (MNMailbox * self);
#line 102 "mn-mailbox.c"
-#line 357 "src/mn-mailbox.gob"
+#line 363 "src/mn-mailbox.gob"
static gboolean mn_mailbox_remove_stale_messages_cb (gpointer key, MNMessage * message, GHashTable * messages);
#line 105 "mn-mailbox.c"
-#line 375 "src/mn-mailbox.gob"
+#line 381 "src/mn-mailbox.gob"
static gboolean mn_mailbox_compare_messages (GHashTable * messages1, GHashTable * messages2);
#line 108 "mn-mailbox.c"
-#line 387 "src/mn-mailbox.gob"
+#line 393 "src/mn-mailbox.gob"
static void mn_mailbox_compare_messages_cb (const char * id, MNMessage * message, CompareMessagesInfo * info);
#line 111 "mn-mailbox.c"
-#line 409 "src/mn-mailbox.gob"
+#line 415 "src/mn-mailbox.gob"
static void mn_mailbox_messages_changed (MNMailbox * self, gboolean has_new);
#line 114 "mn-mailbox.c"
-#line 502 "src/mn-mailbox.gob"
+#line 508 "src/mn-mailbox.gob"
static void mn_mailbox_init (MNMailbox * self);
#line 117 "mn-mailbox.c"
-#line 507 "src/mn-mailbox.gob"
+#line 513 "src/mn-mailbox.gob"
static void mn_mailbox_finalize (MNMailbox * self);
#line 120 "mn-mailbox.c"
-#line 518 "src/mn-mailbox.gob"
+#line 524 "src/mn-mailbox.gob"
static void mn_mailbox_notify_display_seen_messages_cb (GConfClient * client, unsigned int cnxn_id, GConfEntry * entry, gpointer user_data);
#line 123 "mn-mailbox.c"
-#line 703 "src/mn-mailbox.gob"
+#line 709 "src/mn-mailbox.gob"
static MNMailbox * mn_mailbox_parse_obsolete_uri (const char * uri);
#line 126 "mn-mailbox.c"
-#line 927 "src/mn-mailbox.gob"
+#line 933 "src/mn-mailbox.gob"
static gboolean mn_mailbox_check_timeout_cb (gpointer data);
#line 129 "mn-mailbox.c"
-#line 937 "src/mn-mailbox.gob"
+#line 943 "src/mn-mailbox.gob"
static gboolean mn_mailbox_validate (MNMailbox * self, GError ** err);
#line 132 "mn-mailbox.c"
static void ___real_mn_mailbox_seal (MNMailbox * self);
-#line 1001 "src/mn-mailbox.gob"
+#line 1007 "src/mn-mailbox.gob"
static MNMailbox * mn_mailbox_parse_uri (MNMailbox * self, const char * uri) G_GNUC_UNUSED;
#line 136 "mn-mailbox.c"
static void ___real_mn_mailbox_check (MNMailbox * self);
-#line 1072 "src/mn-mailbox.gob"
+#line 1078 "src/mn-mailbox.gob"
static void mn_mailbox_consider_as_read_real (MNMailbox * self, MNMessage * message);
#line 140 "mn-mailbox.c"
@@ -307,7 +307,7 @@ ___finalize(GObject *obj_self)
#define __GOB_FUNCTION__ "MN:Mailbox::finalize"
MNMailbox *self G_GNUC_UNUSED = MN_MAILBOX (obj_self);
gpointer priv G_GNUC_UNUSED = self->_priv;
-#line 507 "src/mn-mailbox.gob"
+#line 513 "src/mn-mailbox.gob"
mn_mailbox_finalize (self);
#line 313 "mn-mailbox.c"
if(G_OBJECT_CLASS(parent_class)->finalize) \
@@ -339,19 +339,19 @@ ___finalize(GObject *obj_self)
#line 246 "src/mn-mailbox.gob"
if(self->_priv->all_messages) { mn_g_object_slist_free ((gpointer) self->_priv->all_messages); self->_priv->all_messages = NULL; }
#line 342 "mn-mailbox.c"
-#line 249 "src/mn-mailbox.gob"
+#line 255 "src/mn-mailbox.gob"
if(self->_priv->all_messages_mid_hash_table) { g_hash_table_destroy ((gpointer) self->_priv->all_messages_mid_hash_table); self->_priv->all_messages_mid_hash_table = NULL; }
#line 345 "mn-mailbox.c"
-#line 256 "src/mn-mailbox.gob"
+#line 262 "src/mn-mailbox.gob"
if(self->_priv->all_messages_considered_as_read) { g_hash_table_destroy ((gpointer) self->_priv->all_messages_considered_as_read); self->_priv->all_messages_considered_as_read = NULL; }
#line 348 "mn-mailbox.c"
-#line 259 "src/mn-mailbox.gob"
+#line 265 "src/mn-mailbox.gob"
if(self->messages) { mn_g_object_ptr_array_free ((gpointer) self->messages); self->messages = NULL; }
#line 351 "mn-mailbox.c"
-#line 262 "src/mn-mailbox.gob"
+#line 268 "src/mn-mailbox.gob"
if(self->_priv->messages_hash_table) { g_hash_table_destroy ((gpointer) self->_priv->messages_hash_table); self->_priv->messages_hash_table = NULL; }
#line 354 "mn-mailbox.c"
-#line 412 "src/mn-mailbox.gob"
+#line 418 "src/mn-mailbox.gob"
if(self->error) { g_free ((gpointer) self->error); self->error = NULL; }
#line 357 "mn-mailbox.c"
}
@@ -399,7 +399,7 @@ mn_mailbox_class_init (MNMailboxClass * c G_GNUC_UNUSED)
G_TYPE_NONE, 1,
G_TYPE_BOOLEAN);
if ___GOB_UNLIKELY(sizeof(gboolean ) != sizeof(gboolean ) || parent_class == NULL /* avoid warning */) {
- g_error("src/mn-mailbox.gob line 409: Type mismatch of \"messages_changed\" signal signature");
+ g_error("src/mn-mailbox.gob line 415: Type mismatch of \"messages_changed\" signal signature");
}
#line 143 "src/mn-mailbox.gob"
@@ -408,11 +408,11 @@ mn_mailbox_class_init (MNMailboxClass * c G_GNUC_UNUSED)
c->removed = ___real_mn_mailbox_removed;
#line 410 "mn-mailbox.c"
c->messages_changed = NULL;
-#line 986 "src/mn-mailbox.gob"
+#line 992 "src/mn-mailbox.gob"
c->seal = ___real_mn_mailbox_seal;
#line 414 "mn-mailbox.c"
c->parse_uri = NULL;
-#line 1004 "src/mn-mailbox.gob"
+#line 1010 "src/mn-mailbox.gob"
c->check = ___real_mn_mailbox_check;
#line 418 "mn-mailbox.c"
g_object_class->finalize = ___finalize;
@@ -533,7 +533,7 @@ mn_mailbox_class_init (MNMailboxClass * c G_GNUC_UNUSED)
}
}
#undef __GOB_FUNCTION__
-#line 502 "src/mn-mailbox.gob"
+#line 508 "src/mn-mailbox.gob"
static void
mn_mailbox_init (MNMailbox * self G_GNUC_UNUSED)
{
@@ -543,20 +543,20 @@ mn_mailbox_init (MNMailbox * self G_GNUC_UNUSED)
#line 161 "src/mn-mailbox.gob"
self->_priv->poll = TRUE;
#line 546 "mn-mailbox.c"
-#line 249 "src/mn-mailbox.gob"
- self->_priv->all_messages_mid_hash_table = g_hash_table_new(g_str_hash, g_str_equal);
+#line 255 "src/mn-mailbox.gob"
+ self->_priv->all_messages_mid_hash_table = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify) g_object_unref);
#line 549 "mn-mailbox.c"
-#line 256 "src/mn-mailbox.gob"
+#line 262 "src/mn-mailbox.gob"
self->_priv->all_messages_considered_as_read = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify) g_object_unref);
#line 552 "mn-mailbox.c"
-#line 259 "src/mn-mailbox.gob"
+#line 265 "src/mn-mailbox.gob"
self->messages = g_ptr_array_new();
#line 555 "mn-mailbox.c"
-#line 262 "src/mn-mailbox.gob"
+#line 268 "src/mn-mailbox.gob"
self->_priv->messages_hash_table = g_hash_table_new(g_str_hash, g_str_equal);
#line 558 "mn-mailbox.c"
{
-#line 503 "src/mn-mailbox.gob"
+#line 509 "src/mn-mailbox.gob"
mn_g_object_gconf_notification_add_gdk_locked(self, MN_CONF_DISPLAY_SEEN_MAIL, self_notify_display_seen_messages_cb, self);
@@ -657,7 +657,7 @@ self->check_delay = g_value_get_int (VAL);
break;
case PROP_ERROR:
{
-#line 413 "src/mn-mailbox.gob"
+#line 419 "src/mn-mailbox.gob"
{ char *old = self->error; self->error = g_value_dup_string (VAL); g_free (old); }
#line 663 "mn-mailbox.c"
}
@@ -762,7 +762,7 @@ g_value_set_int (VAL, self->check_delay);
break;
case PROP_MESSAGES:
{
-#line 269 "src/mn-mailbox.gob"
+#line 275 "src/mn-mailbox.gob"
g_value_set_pointer(VAL, self->messages);
@@ -771,7 +771,7 @@ g_value_set_int (VAL, self->check_delay);
break;
case PROP_ERROR:
{
-#line 413 "src/mn-mailbox.gob"
+#line 419 "src/mn-mailbox.gob"
g_value_set_string (VAL, self->error);
#line 777 "mn-mailbox.c"
}
@@ -1045,19 +1045,19 @@ mn_mailbox_update_check_timeout (MNMailbox * self)
#line 1046 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 273 "src/mn-mailbox.gob"
+#line 279 "src/mn-mailbox.gob"
void
mn_mailbox_set_messages (MNMailbox * self, GSList * messages)
{
#line 1053 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::set_messages"
-#line 273 "src/mn-mailbox.gob"
+#line 279 "src/mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 273 "src/mn-mailbox.gob"
+#line 279 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
#line 1059 "mn-mailbox.c"
{
-#line 275 "src/mn-mailbox.gob"
+#line 281 "src/mn-mailbox.gob"
mn_g_object_slist_free(selfp->all_messages);
selfp->all_messages = mn_g_object_slist_copy(messages);
@@ -1076,19 +1076,19 @@ mn_mailbox_set_messages (MNMailbox * self, GSList * messages)
* list in @self->messages. Additionally, if @self->messages has
* changed, emits the "messages-changed" signal.
**/
-#line 291 "src/mn-mailbox.gob"
+#line 297 "src/mn-mailbox.gob"
static void
mn_mailbox_filter_messages (MNMailbox * self)
{
#line 1084 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::filter_messages"
-#line 291 "src/mn-mailbox.gob"
+#line 297 "src/mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 291 "src/mn-mailbox.gob"
+#line 297 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
#line 1090 "mn-mailbox.c"
{
-#line 293 "src/mn-mailbox.gob"
+#line 299 "src/mn-mailbox.gob"
GPtrArray *messages;
GHashTable *all_messages_hash_table;
@@ -1115,7 +1115,7 @@ mn_mailbox_filter_messages (MNMailbox * self)
g_hash_table_replace(all_messages_hash_table, message->id, message);
if (message->mid)
- g_hash_table_replace(selfp->all_messages_mid_hash_table, message->mid, message);
+ g_hash_table_replace(selfp->all_messages_mid_hash_table, message->mid, g_object_ref(message));
if ((display_seen_mail || (message->flags & MN_MESSAGE_NEW) != 0)
&& ! g_hash_table_lookup(selfp->all_messages_considered_as_read, message->id))
@@ -1155,14 +1155,14 @@ mn_mailbox_filter_messages (MNMailbox * self)
#line 1156 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 357 "src/mn-mailbox.gob"
+#line 363 "src/mn-mailbox.gob"
static gboolean
mn_mailbox_remove_stale_messages_cb (gpointer key, MNMessage * message, GHashTable * messages)
{
#line 1163 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::remove_stale_messages_cb"
{
-#line 361 "src/mn-mailbox.gob"
+#line 367 "src/mn-mailbox.gob"
return g_hash_table_lookup(messages, message->id) == NULL;
}}
@@ -1179,14 +1179,14 @@ mn_mailbox_remove_stale_messages_cb (gpointer key, MNMessage * message, GHashTab
* Return value: %TRUE if @messages1 contains messages not present
* in @messages2, %FALSE otherwise.
**/
-#line 375 "src/mn-mailbox.gob"
+#line 381 "src/mn-mailbox.gob"
static gboolean
mn_mailbox_compare_messages (GHashTable * messages1, GHashTable * messages2)
{
#line 1187 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::compare_messages"
{
-#line 377 "src/mn-mailbox.gob"
+#line 383 "src/mn-mailbox.gob"
CompareMessagesInfo info;
@@ -1199,14 +1199,14 @@ mn_mailbox_compare_messages (GHashTable * messages1, GHashTable * messages2)
#line 1200 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 387 "src/mn-mailbox.gob"
+#line 393 "src/mn-mailbox.gob"
static void
mn_mailbox_compare_messages_cb (const char * id, MNMessage * message, CompareMessagesInfo * info)
{
#line 1207 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::compare_messages_cb"
{
-#line 391 "src/mn-mailbox.gob"
+#line 397 "src/mn-mailbox.gob"
if (! info->changed && ! g_hash_table_lookup(info->other, id))
info->changed = TRUE;
@@ -1214,7 +1214,7 @@ mn_mailbox_compare_messages_cb (const char * id, MNMessage * message, CompareMes
#line 1215 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 409 "src/mn-mailbox.gob"
+#line 415 "src/mn-mailbox.gob"
static void
mn_mailbox_messages_changed (MNMailbox * self, gboolean has_new)
{
@@ -1225,9 +1225,9 @@ mn_mailbox_messages_changed (MNMailbox * self, gboolean has_new)
memset (&___return_val, 0, sizeof (___return_val));
memset (&___param_values, 0, sizeof (___param_values));
-#line 409 "src/mn-mailbox.gob"
+#line 415 "src/mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 409 "src/mn-mailbox.gob"
+#line 415 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
#line 1233 "mn-mailbox.c"
@@ -1248,19 +1248,19 @@ memset (&___param_values, 0, sizeof (___param_values));
g_value_unset (&___param_values[1]);
}
-#line 416 "src/mn-mailbox.gob"
+#line 422 "src/mn-mailbox.gob"
void
mn_mailbox_set_error (MNMailbox * self, const char * format, ...)
{
#line 1256 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::set_error"
-#line 416 "src/mn-mailbox.gob"
+#line 422 "src/mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 416 "src/mn-mailbox.gob"
+#line 422 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
#line 1262 "mn-mailbox.c"
{
-#line 418 "src/mn-mailbox.gob"
+#line 424 "src/mn-mailbox.gob"
char *error = NULL;
@@ -1273,14 +1273,14 @@ mn_mailbox_set_error (MNMailbox * self, const char * format, ...)
#line 1274 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 428 "src/mn-mailbox.gob"
+#line 434 "src/mn-mailbox.gob"
void
mn_mailbox_init_types (void)
{
#line 1281 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::init_types"
{
-#line 430 "src/mn-mailbox.gob"
+#line 436 "src/mn-mailbox.gob"
int i = 0;
@@ -1316,17 +1316,17 @@ mn_mailbox_init_types (void)
#line 1317 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 464 "src/mn-mailbox.gob"
+#line 470 "src/mn-mailbox.gob"
MNMailboxClass *
mn_mailbox_get_class_from_name (const char * type)
{
#line 1324 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::get_class_from_name"
-#line 464 "src/mn-mailbox.gob"
+#line 470 "src/mn-mailbox.gob"
g_return_val_if_fail (type != NULL, (MNMailboxClass * )0);
#line 1328 "mn-mailbox.c"
{
-#line 466 "src/mn-mailbox.gob"
+#line 472 "src/mn-mailbox.gob"
int i;
@@ -1346,17 +1346,17 @@ mn_mailbox_get_class_from_name (const char * type)
#line 1347 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 483 "src/mn-mailbox.gob"
+#line 489 "src/mn-mailbox.gob"
GType
mn_mailbox_get_type_from_name (const char * type)
{
#line 1354 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::get_type_from_name"
-#line 483 "src/mn-mailbox.gob"
+#line 489 "src/mn-mailbox.gob"
g_return_val_if_fail (type != NULL, (GType )0);
#line 1358 "mn-mailbox.c"
{
-#line 485 "src/mn-mailbox.gob"
+#line 491 "src/mn-mailbox.gob"
SelfClass *class;
@@ -1377,14 +1377,14 @@ mn_mailbox_get_type_from_name (const char * type)
#undef __GOB_FUNCTION__
-#line 507 "src/mn-mailbox.gob"
+#line 513 "src/mn-mailbox.gob"
static void
mn_mailbox_finalize (MNMailbox * self)
{
#line 1385 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::finalize"
{
-#line 508 "src/mn-mailbox.gob"
+#line 514 "src/mn-mailbox.gob"
/*
* Even though we clear the source in removed(), it might have
@@ -1397,14 +1397,14 @@ mn_mailbox_finalize (MNMailbox * self)
#line 1398 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 518 "src/mn-mailbox.gob"
+#line 524 "src/mn-mailbox.gob"
static void
mn_mailbox_notify_display_seen_messages_cb (GConfClient * client, unsigned int cnxn_id, GConfEntry * entry, gpointer user_data)
{
#line 1405 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::notify_display_seen_messages_cb"
{
-#line 523 "src/mn-mailbox.gob"
+#line 529 "src/mn-mailbox.gob"
Self *self = user_data;
@@ -1413,17 +1413,17 @@ mn_mailbox_notify_display_seen_messages_cb (GConfClient * client, unsigned int c
#line 1414 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 530 "src/mn-mailbox.gob"
+#line 536 "src/mn-mailbox.gob"
MNMailbox *
mn_mailbox_new (const char * type, ...)
{
#line 1421 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::new"
-#line 530 "src/mn-mailbox.gob"
+#line 536 "src/mn-mailbox.gob"
g_return_val_if_fail (type != NULL, (MNMailbox * )0);
#line 1425 "mn-mailbox.c"
{
-#line 532 "src/mn-mailbox.gob"
+#line 538 "src/mn-mailbox.gob"
va_list args;
GType type_id;
@@ -1444,17 +1444,17 @@ mn_mailbox_new (const char * type, ...)
#line 1445 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 550 "src/mn-mailbox.gob"
+#line 556 "src/mn-mailbox.gob"
MNMailbox *
mn_mailbox_new_from_xml_node (xmlNode * node, GError ** err)
{
#line 1452 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::new_from_xml_node"
-#line 550 "src/mn-mailbox.gob"
+#line 556 "src/mn-mailbox.gob"
g_return_val_if_fail (node != NULL, (MNMailbox * )0);
#line 1456 "mn-mailbox.c"
{
-#line 552 "src/mn-mailbox.gob"
+#line 558 "src/mn-mailbox.gob"
char *type;
Self *self = NULL;
@@ -1488,19 +1488,19 @@ mn_mailbox_new_from_xml_node (xmlNode * node, GError ** err)
#line 1489 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 583 "src/mn-mailbox.gob"
+#line 589 "src/mn-mailbox.gob"
xmlNode *
mn_mailbox_xml_node_new (MNMailbox * self)
{
#line 1496 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::xml_node_new"
-#line 583 "src/mn-mailbox.gob"
+#line 589 "src/mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (xmlNode * )0);
-#line 583 "src/mn-mailbox.gob"
+#line 589 "src/mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (xmlNode * )0);
#line 1502 "mn-mailbox.c"
{
-#line 585 "src/mn-mailbox.gob"
+#line 591 "src/mn-mailbox.gob"
xmlNode *node;
@@ -1513,17 +1513,17 @@ mn_mailbox_xml_node_new (MNMailbox * self)
#line 1514 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 595 "src/mn-mailbox.gob"
+#line 601 "src/mn-mailbox.gob"
MNMailbox *
mn_mailbox_new_from_uri (const char * uri)
{
#line 1521 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::new_from_uri"
-#line 595 "src/mn-mailbox.gob"
+#line 601 "src/mn-mailbox.gob"
g_return_val_if_fail (uri != NULL, (MNMailbox * )0);
#line 1525 "mn-mailbox.c"
{
-#line 597 "src/mn-mailbox.gob"
+#line 603 "src/mn-mailbox.gob"
int i;
@@ -1545,36 +1545,36 @@ mn_mailbox_new_from_uri (const char * uri)
#line 1546 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 616 "src/mn-mailbox.gob"
+#line 622 "src/mn-mailbox.gob"
MNMailbox *
mn_mailbox_new_from_configuration (MNMailboxConfiguration * config)
{
#line 1553 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::new_from_configuration"
-#line 616 "src/mn-mailbox.gob"
+#line 622 "src/mn-mailbox.gob"
g_return_val_if_fail (config != NULL, (MNMailbox * )0);
#line 1557 "mn-mailbox.c"
{
-#line 618 "src/mn-mailbox.gob"
+#line 624 "src/mn-mailbox.gob"
return g_object_newv(config->type, config->n_parameters, config->parameters);
}}
#line 1563 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 622 "src/mn-mailbox.gob"
+#line 628 "src/mn-mailbox.gob"
MNMailboxConfiguration *
mn_mailbox_get_configuration (MNMailbox * self)
{
#line 1570 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::get_configuration"
-#line 622 "src/mn-mailbox.gob"
+#line 628 "src/mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (MNMailboxConfiguration * )0);
-#line 622 "src/mn-mailbox.gob"
+#line 628 "src/mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (MNMailboxConfiguration * )0);
#line 1576 "mn-mailbox.c"
{
-#line 624 "src/mn-mailbox.gob"
+#line 630 "src/mn-mailbox.gob"
GObject *object = G_OBJECT(self);
GArray *parameters;
@@ -1610,17 +1610,17 @@ mn_mailbox_get_configuration (MNMailbox * self)
#line 1611 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 657 "src/mn-mailbox.gob"
+#line 663 "src/mn-mailbox.gob"
void
mn_mailbox_configuration_free (MNMailboxConfiguration * config)
{
#line 1618 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::configuration_free"
-#line 657 "src/mn-mailbox.gob"
+#line 663 "src/mn-mailbox.gob"
g_return_if_fail (config != NULL);
#line 1622 "mn-mailbox.c"
{
-#line 659 "src/mn-mailbox.gob"
+#line 665 "src/mn-mailbox.gob"
int i;
@@ -1633,17 +1633,17 @@ mn_mailbox_configuration_free (MNMailboxConfiguration * config)
#line 1634 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 669 "src/mn-mailbox.gob"
+#line 675 "src/mn-mailbox.gob"
MNMailbox *
mn_mailbox_new_from_obsolete_uri (const char * uri)
{
#line 1641 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::new_from_obsolete_uri"
-#line 669 "src/mn-mailbox.gob"
+#line 675 "src/mn-mailbox.gob"
g_return_val_if_fail (uri != NULL, (MNMailbox * )0);
#line 1645 "mn-mailbox.c"
{
-#line 671 "src/mn-mailbox.gob"
+#line 677 "src/mn-mailbox.gob"
char *real_uri;
char *scheme;
@@ -1678,17 +1678,17 @@ mn_mailbox_new_from_obsolete_uri (const char * uri)
#line 1679 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 703 "src/mn-mailbox.gob"
+#line 709 "src/mn-mailbox.gob"
static MNMailbox *
mn_mailbox_parse_obsolete_uri (const char * uri)
{
#line 1686 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::parse_obsolete_uri"
-#line 703 "src/mn-mailbox.gob"
+#line 709 "src/mn-mailbox.gob"
g_return_val_if_fail (uri != NULL, (MNMailbox * )0);
#line 1690 "mn-mailbox.c"
{
-#line 705 "src/mn-mailbox.gob"
+#line 711 "src/mn-mailbox.gob"
int len;
int buflen;
@@ -1913,14 +1913,14 @@ mn_mailbox_parse_obsolete_uri (const char * uri)
#line 1914 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 927 "src/mn-mailbox.gob"
+#line 933 "src/mn-mailbox.gob"
static gboolean
mn_mailbox_check_timeout_cb (gpointer data)
{
#line 1921 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::check_timeout_cb"
{
-#line 929 "src/mn-mailbox.gob"
+#line 935 "src/mn-mailbox.gob"
Self *self = data;
@@ -1931,19 +1931,19 @@ mn_mailbox_check_timeout_cb (gpointer data)
#line 1932 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 937 "src/mn-mailbox.gob"
+#line 943 "src/mn-mailbox.gob"
static gboolean
mn_mailbox_validate (MNMailbox * self, GError ** err)
{
#line 1939 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::validate"
-#line 937 "src/mn-mailbox.gob"
+#line 943 "src/mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 937 "src/mn-mailbox.gob"
+#line 943 "src/mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (gboolean )0);
#line 1945 "mn-mailbox.c"
{
-#line 939 "src/mn-mailbox.gob"
+#line 945 "src/mn-mailbox.gob"
GParamSpec **properties;
unsigned int n_properties;
@@ -1993,15 +1993,15 @@ mn_mailbox_validate (MNMailbox * self, GError ** err)
* properties dialog. That would not be possible from init(), since
* these properties are only set after the mailbox is constructed.
**/
-#line 986 "src/mn-mailbox.gob"
+#line 992 "src/mn-mailbox.gob"
void
mn_mailbox_seal (MNMailbox * self)
{
#line 2001 "mn-mailbox.c"
MNMailboxClass *klass;
-#line 986 "src/mn-mailbox.gob"
+#line 992 "src/mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 986 "src/mn-mailbox.gob"
+#line 992 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
#line 2007 "mn-mailbox.c"
klass = MN_MAILBOX_GET_CLASS(self);
@@ -2009,14 +2009,14 @@ mn_mailbox_seal (MNMailbox * self)
if(klass->seal)
(*klass->seal)(self);
}
-#line 986 "src/mn-mailbox.gob"
+#line 992 "src/mn-mailbox.gob"
static void
___real_mn_mailbox_seal (MNMailbox * self G_GNUC_UNUSED)
{
#line 2017 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::seal"
{
-#line 988 "src/mn-mailbox.gob"
+#line 994 "src/mn-mailbox.gob"
if (self->name)
{
@@ -2031,17 +2031,17 @@ ___real_mn_mailbox_seal (MNMailbox * self G_GNUC_UNUSED)
#line 2032 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1001 "src/mn-mailbox.gob"
+#line 1007 "src/mn-mailbox.gob"
static MNMailbox *
mn_mailbox_parse_uri (MNMailbox * self, const char * uri)
{
#line 2039 "mn-mailbox.c"
MNMailboxClass *klass;
-#line 1001 "src/mn-mailbox.gob"
+#line 1007 "src/mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (MNMailbox * )0);
-#line 1001 "src/mn-mailbox.gob"
+#line 1007 "src/mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (MNMailbox * )0);
-#line 1001 "src/mn-mailbox.gob"
+#line 1007 "src/mn-mailbox.gob"
g_return_val_if_fail (uri != NULL, (MNMailbox * )0);
#line 2047 "mn-mailbox.c"
klass = MN_MAILBOX_GET_CLASS(self);
@@ -2052,15 +2052,15 @@ mn_mailbox_parse_uri (MNMailbox * self, const char * uri)
return (MNMailbox * )(0);
}
-#line 1004 "src/mn-mailbox.gob"
+#line 1010 "src/mn-mailbox.gob"
void
mn_mailbox_check (MNMailbox * self)
{
#line 2060 "mn-mailbox.c"
MNMailboxClass *klass;
-#line 1004 "src/mn-mailbox.gob"
+#line 1010 "src/mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 1004 "src/mn-mailbox.gob"
+#line 1010 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
#line 2066 "mn-mailbox.c"
klass = MN_MAILBOX_GET_CLASS(self);
@@ -2068,14 +2068,14 @@ mn_mailbox_check (MNMailbox * self)
if(klass->check)
(*klass->check)(self);
}
-#line 1004 "src/mn-mailbox.gob"
+#line 1010 "src/mn-mailbox.gob"
static void
___real_mn_mailbox_check (MNMailbox * self G_GNUC_UNUSED)
{
#line 2076 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::check"
{
-#line 1006 "src/mn-mailbox.gob"
+#line 1012 "src/mn-mailbox.gob"
g_assert(self_get_active(self) == TRUE);
g_assert(selfp->checking_enabled == TRUE);
@@ -2083,19 +2083,19 @@ ___real_mn_mailbox_check (MNMailbox * self G_GNUC_UNUSED)
#line 2084 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1020 "src/mn-mailbox.gob"
+#line 1026 "src/mn-mailbox.gob"
void
mn_mailbox_enable_checking (MNMailbox * self)
{
#line 2091 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::enable_checking"
-#line 1020 "src/mn-mailbox.gob"
+#line 1026 "src/mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 1020 "src/mn-mailbox.gob"
+#line 1026 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
#line 2097 "mn-mailbox.c"
{
-#line 1022 "src/mn-mailbox.gob"
+#line 1028 "src/mn-mailbox.gob"
selfp->checking_enabled = TRUE;
g_object_notify(G_OBJECT(self), "manually-checkable");
@@ -2106,21 +2106,21 @@ mn_mailbox_enable_checking (MNMailbox * self)
#line 2107 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1031 "src/mn-mailbox.gob"
+#line 1037 "src/mn-mailbox.gob"
void
mn_mailbox_notice (MNMailbox * self, const char * format, ...)
{
#line 2114 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::notice"
-#line 1031 "src/mn-mailbox.gob"
+#line 1037 "src/mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 1031 "src/mn-mailbox.gob"
+#line 1037 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 1031 "src/mn-mailbox.gob"
+#line 1037 "src/mn-mailbox.gob"
g_return_if_fail (format != NULL);
#line 2122 "mn-mailbox.c"
{
-#line 1033 "src/mn-mailbox.gob"
+#line 1039 "src/mn-mailbox.gob"
char *message;
@@ -2138,21 +2138,21 @@ mn_mailbox_notice (MNMailbox * self, const char * format, ...)
#line 2139 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1049 "src/mn-mailbox.gob"
+#line 1055 "src/mn-mailbox.gob"
void
mn_mailbox_warning (MNMailbox * self, const char * format, ...)
{
#line 2146 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::warning"
-#line 1049 "src/mn-mailbox.gob"
+#line 1055 "src/mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 1049 "src/mn-mailbox.gob"
+#line 1055 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 1049 "src/mn-mailbox.gob"
+#line 1055 "src/mn-mailbox.gob"
g_return_if_fail (format != NULL);
#line 2154 "mn-mailbox.c"
{
-#line 1051 "src/mn-mailbox.gob"
+#line 1057 "src/mn-mailbox.gob"
char *message;
@@ -2170,63 +2170,63 @@ mn_mailbox_warning (MNMailbox * self, const char * format, ...)
#line 2171 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1066 "src/mn-mailbox.gob"
+#line 1072 "src/mn-mailbox.gob"
MNMessage *
mn_mailbox_get_message_from_mid (MNMailbox * self, const char * mid)
{
#line 2178 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::get_message_from_mid"
-#line 1066 "src/mn-mailbox.gob"
+#line 1072 "src/mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (MNMessage * )0);
-#line 1066 "src/mn-mailbox.gob"
+#line 1072 "src/mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (MNMessage * )0);
-#line 1066 "src/mn-mailbox.gob"
+#line 1072 "src/mn-mailbox.gob"
g_return_val_if_fail (mid != NULL, (MNMessage * )0);
#line 2186 "mn-mailbox.c"
{
-#line 1068 "src/mn-mailbox.gob"
+#line 1074 "src/mn-mailbox.gob"
return g_hash_table_lookup(selfp->all_messages_mid_hash_table, mid);
}}
#line 2192 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1072 "src/mn-mailbox.gob"
+#line 1078 "src/mn-mailbox.gob"
static void
mn_mailbox_consider_as_read_real (MNMailbox * self, MNMessage * message)
{
#line 2199 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::consider_as_read_real"
-#line 1072 "src/mn-mailbox.gob"
+#line 1078 "src/mn-mailbox.gob"
g_return_if_fail (self != NULL);
-#line 1072 "src/mn-mailbox.gob"
+#line 1078 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (self));
-#line 1072 "src/mn-mailbox.gob"
+#line 1078 "src/mn-mailbox.gob"
g_return_if_fail (message != NULL);
-#line 1072 "src/mn-mailbox.gob"
+#line 1078 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MESSAGE (message));
#line 2209 "mn-mailbox.c"
{
-#line 1074 "src/mn-mailbox.gob"
+#line 1080 "src/mn-mailbox.gob"
g_hash_table_replace(selfp->all_messages_considered_as_read, message->id, g_object_ref(message));
}}
#line 2215 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1088 "src/mn-mailbox.gob"
+#line 1094 "src/mn-mailbox.gob"
void
mn_mailbox_consider_as_read (MNMessage * message)
{
#line 2222 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::consider_as_read"
-#line 1088 "src/mn-mailbox.gob"
+#line 1094 "src/mn-mailbox.gob"
g_return_if_fail (message != NULL);
-#line 1088 "src/mn-mailbox.gob"
+#line 1094 "src/mn-mailbox.gob"
g_return_if_fail (MN_IS_MESSAGE (message));
#line 2228 "mn-mailbox.c"
{
-#line 1090 "src/mn-mailbox.gob"
+#line 1096 "src/mn-mailbox.gob"
Self *self;
@@ -2240,14 +2240,14 @@ mn_mailbox_consider_as_read (MNMessage * message)
#line 2241 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1106 "src/mn-mailbox.gob"
+#line 1112 "src/mn-mailbox.gob"
void
mn_mailbox_consider_as_read_list (GSList * messages)
{
#line 2248 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::consider_as_read_list"
{
-#line 1108 "src/mn-mailbox.gob"
+#line 1114 "src/mn-mailbox.gob"
Self *self = NULL;
GSList *l;
@@ -2273,21 +2273,21 @@ mn_mailbox_consider_as_read_list (GSList * messages)
#line 2274 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1131 "src/mn-mailbox.gob"
+#line 1137 "src/mn-mailbox.gob"
char *
mn_mailbox_get_command (MNMailbox * self, const char * id)
{
#line 2281 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::get_command"
-#line 1131 "src/mn-mailbox.gob"
+#line 1137 "src/mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (char * )0);
-#line 1131 "src/mn-mailbox.gob"
+#line 1137 "src/mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (char * )0);
-#line 1131 "src/mn-mailbox.gob"
+#line 1137 "src/mn-mailbox.gob"
g_return_val_if_fail (id != NULL, (char * )0);
#line 2289 "mn-mailbox.c"
{
-#line 1133 "src/mn-mailbox.gob"
+#line 1139 "src/mn-mailbox.gob"
char *prop;
char *command;
@@ -2307,21 +2307,21 @@ mn_mailbox_get_command (MNMailbox * self, const char * id)
#line 2308 "mn-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1150 "src/mn-mailbox.gob"
+#line 1156 "src/mn-mailbox.gob"
gboolean
mn_mailbox_has_command (MNMailbox * self, const char * id)
{
#line 2315 "mn-mailbox.c"
#define __GOB_FUNCTION__ "MN:Mailbox::has_command"
-#line 1150 "src/mn-mailbox.gob"
+#line 1156 "src/mn-mailbox.gob"
g_return_val_if_fail (self != NULL, (gboolean )0);
-#line 1150 "src/mn-mailbox.gob"
+#line 1156 "src/mn-mailbox.gob"
g_return_val_if_fail (MN_IS_MAILBOX (self), (gboolean )0);
-#line 1150 "src/mn-mailbox.gob"
+#line 1156 "src/mn-mailbox.gob"
g_return_val_if_fail (id != NULL, (gboolean )0);
#line 2323 "mn-mailbox.c"
{
-#line 1152 "src/mn-mailbox.gob"
+#line 1158 "src/mn-mailbox.gob"
char *command;
gboolean has;
diff --git a/build/src/mn-mailbox.h b/build/src/mn-mailbox.h
@@ -120,58 +120,58 @@ void mn_mailbox_set_poll (MNMailbox * self,
#line 230 "src/mn-mailbox.gob"
gboolean mn_mailbox_get_manually_checkable (MNMailbox * self);
#line 123 "mn-mailbox.h"
-#line 428 "src/mn-mailbox.gob"
+#line 434 "src/mn-mailbox.gob"
void mn_mailbox_init_types (void);
#line 126 "mn-mailbox.h"
-#line 464 "src/mn-mailbox.gob"
+#line 470 "src/mn-mailbox.gob"
MNMailboxClass * mn_mailbox_get_class_from_name (const char * type);
#line 129 "mn-mailbox.h"
-#line 483 "src/mn-mailbox.gob"
+#line 489 "src/mn-mailbox.gob"
GType mn_mailbox_get_type_from_name (const char * type);
#line 132 "mn-mailbox.h"
-#line 530 "src/mn-mailbox.gob"
+#line 536 "src/mn-mailbox.gob"
MNMailbox * mn_mailbox_new (const char * type,
...) G_GNUC_NULL_TERMINATED;
#line 136 "mn-mailbox.h"
-#line 550 "src/mn-mailbox.gob"
+#line 556 "src/mn-mailbox.gob"
MNMailbox * mn_mailbox_new_from_xml_node (xmlNode * node,
GError ** err);
#line 140 "mn-mailbox.h"
-#line 583 "src/mn-mailbox.gob"
+#line 589 "src/mn-mailbox.gob"
xmlNode * mn_mailbox_xml_node_new (MNMailbox * self);
#line 143 "mn-mailbox.h"
-#line 595 "src/mn-mailbox.gob"
+#line 601 "src/mn-mailbox.gob"
MNMailbox * mn_mailbox_new_from_uri (const char * uri);
#line 146 "mn-mailbox.h"
-#line 616 "src/mn-mailbox.gob"
+#line 622 "src/mn-mailbox.gob"
MNMailbox * mn_mailbox_new_from_configuration (MNMailboxConfiguration * config);
#line 149 "mn-mailbox.h"
-#line 622 "src/mn-mailbox.gob"
+#line 628 "src/mn-mailbox.gob"
MNMailboxConfiguration * mn_mailbox_get_configuration (MNMailbox * self);
#line 152 "mn-mailbox.h"
-#line 657 "src/mn-mailbox.gob"
+#line 663 "src/mn-mailbox.gob"
void mn_mailbox_configuration_free (MNMailboxConfiguration * config);
#line 155 "mn-mailbox.h"
-#line 669 "src/mn-mailbox.gob"
+#line 675 "src/mn-mailbox.gob"
MNMailbox * mn_mailbox_new_from_obsolete_uri (const char * uri);
#line 158 "mn-mailbox.h"
-#line 986 "src/mn-mailbox.gob"
+#line 992 "src/mn-mailbox.gob"
void mn_mailbox_seal (MNMailbox * self);
#line 161 "mn-mailbox.h"
-#line 1004 "src/mn-mailbox.gob"
+#line 1010 "src/mn-mailbox.gob"
void mn_mailbox_check (MNMailbox * self);
#line 164 "mn-mailbox.h"
-#line 1088 "src/mn-mailbox.gob"
+#line 1094 "src/mn-mailbox.gob"
void mn_mailbox_consider_as_read (MNMessage * message);
#line 167 "mn-mailbox.h"
-#line 1106 "src/mn-mailbox.gob"
+#line 1112 "src/mn-mailbox.gob"
void mn_mailbox_consider_as_read_list (GSList * messages);
#line 170 "mn-mailbox.h"
-#line 1131 "src/mn-mailbox.gob"
+#line 1137 "src/mn-mailbox.gob"
char * mn_mailbox_get_command (MNMailbox * self,
const char * id);
#line 174 "mn-mailbox.h"
-#line 1150 "src/mn-mailbox.gob"
+#line 1156 "src/mn-mailbox.gob"
gboolean mn_mailbox_has_command (MNMailbox * self,
const char * id);
#line 178 "mn-mailbox.h"
diff --git a/data/mail-notification-properties.desktop.in b/data/mail-notification-properties.desktop.in
@@ -4,7 +4,7 @@ _Name=Mail Notification
Icon=mail-notification
_Comment=Configure Mail Notification
Type=Application
-Categories=GNOME;GTK;Settings;
+Categories=GNOME;GTK;Settings;DesktopSettings;
Exec=mail-notification --display-properties
Terminal=false
StartupNotify=true
diff --git a/data/mail-notification.desktop.in b/data/mail-notification.desktop.in
@@ -4,7 +4,7 @@ _Name=Mail Notification
Icon=mail-notification
_Comment=Get notified when new mail arrives
Type=Application
-Categories=GNOME;GTK;Network;
+Categories=GNOME;GTK;Network;Email;
Exec=mail-notification --sm-disable
Terminal=false
StartupNotify=true
diff --git a/help/C/mail-notification-C.omf.in b/help/C/mail-notification-C.omf.in
@@ -12,9 +12,9 @@
Mail Notification Manual
</title>
<date>
- 2008-03-20
+ 2008-04-27
</date>
- <version identifier="2.23" date="2008-03-20" description="Version 2.23"/>
+ <version identifier="2.24" date="2008-04-27" description="Version 2.24"/>
<subject category="GNOME|Internet"/>
<description>
Mail Notification Manual
diff --git a/help/C/mail-notification.xml b/help/C/mail-notification.xml
@@ -2,9 +2,9 @@
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY app "<application>Mail Notification</application>">
- <!ENTITY appversion "5.2">
- <!ENTITY manrevision "2.23">
- <!ENTITY date "Thursday, March 20, 2008">
+ <!ENTITY appversion "5.3">
+ <!ENTITY manrevision "2.24">
+ <!ENTITY date "Sunday, April 27, 2008">
<!ENTITY project "The Mail Notification Project">
@@ -26,7 +26,7 @@
<!ENTITY gnomevfs "<link linkend="gnomevfs">GnomeVFS</link>">
]>
-<!-- $Id: mail-notification.xml,v 1.185 2008-03-20 15:47:14 jylefort Exp $ -->
+<!-- $Id: mail-notification.xml,v 1.186 2008-04-27 14:49:32 jylefort Exp $ -->
<!-- Mail Notification Manual -->
<!-- Copyright (C) 2003-2008 Jean-Yves Lefort -->
@@ -112,6 +112,17 @@
</revdescription>
</revision>
<revision>
+ <revnumber>Mail Notification Manual V2.23</revnumber>
+ <date>Thursday, March 20, 2008</date>
+ <revdescription>
+ <para role="author">
+ Jean-Yves Lefort
+ <email>jylefort@brutele.be</email>
+ </para>
+ <para role="publisher">&project;</para>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>Mail Notification Manual V2.22</revnumber>
<date>Thursday, March 20, 2008</date>
<revdescription>
diff --git a/jb b/jb
@@ -89,7 +89,7 @@ if test -f jbsrc/jb.c; then
mkdir -p build/jbsrc || exit 1
- if ! gobject_cflags_ldflags=`pkg-config --cflags --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then
+ if ! gobject_cflags_libs=`pkg-config --cflags --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then
echo "ERROR: the GLib library was not found" >&2
exit 1
fi
@@ -98,18 +98,19 @@ if test -f jbsrc/jb.c; then
jbsrc/jb.c > build/jbsrc/jb.c || exit 1
if ! $jb_cc \
+ -o build/jbsrc/jb \
-Ijbsrc/lib/src/core -Ijbsrc/lib/src/extras -Ijbsrc \
-DG_LOG_DOMAIN="\"jb\"" \
-DJB_SOURCES="\"$jb_c_sources $jb_h_sources\"" \
-DJB_PACKAGE_SOURCES="\"$jb_c_package_sources $jb_h_package_sources\"" \
- $gobject_cflags_ldflags \
+ $gobject_cflags_libs \
$jb_cflags \
$jb_cppflags \
$jb_ldflags \
- -o build/jbsrc/jb \
build/jbsrc/jb.c \
$jb_c_sources \
- $jb_c_package_sources; then
+ $jb_c_package_sources \
+ $jb_libs; then
echo "ERROR: cannot build jb" >&2
exit 1
fi
diff --git a/jbsrc/jb.c b/jbsrc/jb.c
@@ -72,6 +72,8 @@ jb_package_init (void)
*/
jb_variable_set_string("gob2-minversion", "2.0.16");
+ jb_evolution_plugin_init();
+
backends_group = jb_variable_add_group("Mailbox backends");
pi_group = jb_variable_add_group("IMAP and POP3 features");
@@ -420,7 +422,7 @@ jb_package_add_resources (void)
*/
jb_compile_options_add_cflags(object->compile_options, "-std=c99");
jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L");
- jb_compile_options_add_ldflags(object->compile_options, "-lbsd-compat");
+ jb_compile_options_add_libs(object->compile_options, "-lbsd-compat");
}
jb_compile_options_add_string_defines(object->compile_options,
@@ -441,7 +443,7 @@ jb_package_add_resources (void)
*/
jb_compile_options_add_ldflags(object->compile_options, "-Wl,--export-dynamic");
- jb_compile_options_add_ldflags(object->compile_options, "-lm");
+ jb_compile_options_add_libs(object->compile_options, "-lm");
jb_compile_options_add_package(object->compile_options, "gettext");
jb_compile_options_add_package(object->compile_options, "gnome");
@@ -627,7 +629,7 @@ jb_package_add_resources (void)
JBObject *plugin;
jb_group_add_resource(group, JB_GROUP_RESOURCE(jb_template_new("org-jylefort-mail-notification.eplug.in")));
- jb_group_add_data_file(group, "org-jylefort-mail-notification.eplug", "$evolution-plugindir");
+ jb_group_add_data_file(group, "org-jylefort-mail-notification.eplug", "$evolution-plugin-dir");
jb_compile_options_add_cflags(object->compile_options, "$evolution-plugin-cflags");
@@ -653,7 +655,7 @@ jb_package_add_resources (void)
plugin = JB_OBJECT(jb_module_new("liborg-jylefort-mail-notification"));
- jb_install_options_set_installdir(plugin->install_options, "$evolution-plugindir");
+ jb_install_options_set_installdir(plugin->install_options, "$evolution-plugin-dir");
jb_compile_options_add_package(plugin->compile_options, "gettext");
jb_compile_options_add_package(plugin->compile_options, "evolution-plugin");
@@ -706,4 +708,4 @@ jb_package_add_resources (void)
}
}
-JB_MAIN("mail-notification", "5.2", "Mail Notification")
+JB_MAIN("mail-notification", "5.3", "Mail Notification")
diff --git a/jbsrc/lib/README b/jbsrc/lib/README
@@ -13,7 +13,7 @@ Index
0. About this document
- $Id: README,v 1.2 2008-02-20 04:19:11 jylefort Exp $
+ $Id: README,v 1.3 2008-04-25 22:58:19 jylefort Exp $
Copyright (C) 2008 Jean-Yves Lefort.
@@ -41,8 +41,8 @@ Index
The first time ./jb is run, it bootstraps itself by compiling
the real JB program, which is written in C. If you need to
influence the way this program is compiled, you can set the
- jb_cc, jb_cflags, jb_cppflags and jb_ldflags environment
- variables, for instance:
+ jb_cc, jb_cflags, jb_cppflags, jb_ldflags and jb_libs
+ environment variables, for instance:
jb_cc=gcc jb_cflags=-g ./jb configure
diff --git a/jbsrc/lib/src/core/jb-compile-options.c b/jbsrc/lib/src/core/jb-compile-options.c
@@ -94,6 +94,7 @@ jb_compile_options_new (const char *name)
init_variable(self, "cflags");
init_variable(self, "cppflags");
init_variable(self, "ldflags");
+ init_variable(self, "libs");
init_variable(self, "gob2flags");
return self;
@@ -181,6 +182,23 @@ jb_compile_options_get_ldflags (JBCompileOptions *self)
}
void
+jb_compile_options_add_libs (JBCompileOptions *self, const char *libs)
+{
+ g_return_if_fail(self != NULL);
+ g_return_if_fail(libs != NULL);
+
+ add_to_variable(self, "libs", libs);
+}
+
+const char *
+jb_compile_options_get_libs (JBCompileOptions *self)
+{
+ g_return_val_if_fail(self != NULL, NULL);
+
+ return get_variable(self, "libs");
+}
+
+void
jb_compile_options_add_gob2flags (JBCompileOptions *self, const char *gob2flags)
{
g_return_if_fail(self != NULL);
@@ -217,6 +235,10 @@ jb_compile_options_add_package (JBCompileOptions *self, const char *name)
value = g_strdup_printf("$%s-ldflags", name);
jb_compile_options_add_ldflags(self, value);
g_free(value);
+
+ value = g_strdup_printf("$%s-libs", name);
+ jb_compile_options_add_libs(self, value);
+ g_free(value);
}
/* evaluates the provided values immediately */
diff --git a/jbsrc/lib/src/core/jb-compile-options.h b/jbsrc/lib/src/core/jb-compile-options.h
@@ -42,6 +42,9 @@ const char *jb_compile_options_get_cppflags (JBCompileOptions *self);
void jb_compile_options_add_ldflags (JBCompileOptions *self, const char *ldflags);
const char *jb_compile_options_get_ldflags (JBCompileOptions *self);
+void jb_compile_options_add_libs (JBCompileOptions *self, const char *libs);
+const char *jb_compile_options_get_libs (JBCompileOptions *self);
+
void jb_compile_options_add_gob2flags (JBCompileOptions *self, const char *gob2flags);
const char *jb_compile_options_get_gob2flags (JBCompileOptions *self);
diff --git a/jbsrc/lib/src/core/jb-feature.c b/jbsrc/lib/src/core/jb-feature.c
@@ -106,9 +106,9 @@ gettext_configure (void)
static const char *functions = "ngettext dgettext bind_textdomain_codeset";
if (jb_check_functions(functions, NULL))
- jb_variable_set_package_flags("gettext", NULL, "-DENABLE_NLS", NULL);
+ jb_variable_set_package_flags("gettext", NULL, "-DENABLE_NLS", NULL, NULL);
else if (jb_check_functions(functions, "intl"))
- jb_variable_set_package_flags("gettext", NULL, "-DENABLE_NLS", "-lintl");
+ jb_variable_set_package_flags("gettext", NULL, "-DENABLE_NLS", NULL, "-lintl");
else
jb_error("gettext found neither in libc nor in libintl");
diff --git a/jbsrc/lib/src/core/jb-main.c b/jbsrc/lib/src/core/jb-main.c
@@ -200,6 +200,11 @@ jb_main (int argc,
jb_variable_group_compiler_options,
0,
NULL);
+ jb_variable_add_string("libs",
+ "C -l flags",
+ jb_variable_group_compiler_options,
+ 0,
+ NULL);
jb_variable_add_bool("cc-dependency-tracking",
"enable C compiler dependency tracking",
jb_variable_group_compiler_options,
diff --git a/jbsrc/lib/src/core/jb-resource.c b/jbsrc/lib/src/core/jb-resource.c
@@ -489,15 +489,16 @@ parse_depsfile (const char *depsfile)
for (j = 0; files[j] != NULL; j++)
{
+ char *work;
char *file;
- file = g_strdup(files[j]);
- file = g_strstrip(file);
+ work = g_strdup(files[j]);
+ file = g_strstrip(work);
if (*file != '\0' && *file != '\\')
deps = g_slist_prepend(deps, g_strdup(file));
- g_free(file);
+ g_free(work);
}
g_strfreev(files);
@@ -562,9 +563,10 @@ object_file_build (JBObject *object, const char *ofile, const char *cfile)
jb_mkdir_of_file(ofile);
- jb_action_exec("$cc $package-cflags $group-cflags $object-cflags $stock-cflags $cflags"
+ jb_action_exec("$cc -c -o $ofile"
+ " $package-cflags $group-cflags $object-cflags $stock-cflags $cflags"
" $package-cppflags $group-cppflags $object-cppflags $stock-cppflags $cppflags"
- " $depsflags -c -o $ofile $cfile",
+ " $depsflags $cfile",
"package-cflags", jb_compile_options_get_cflags(jb_compile_options),
"group-cflags", jb_compile_options_get_cflags(gres->group->compile_options),
"object-cflags", jb_compile_options_get_cflags(object->compile_options),
@@ -1803,16 +1805,23 @@ object_build (JBResource *res)
jb_mkdir(gres->group->builddir);
- jb_action_exec("$cc $package-cflags $group-cflags $object-cflags $cflags"
+ jb_action_exec("$cc -o $outfile"
+ " $package-cflags $group-cflags $object-cflags $stock-cflags $cflags"
" $package-ldflags $group-ldflags $object-ldflags $stock-ldflags $ldflags"
- " -o $outfile $object-files",
+ " $object-files"
+ " $package-libs $group-libs $object-libs $stock-libs $libs",
"package-cflags", jb_compile_options_get_cflags(jb_compile_options),
"group-cflags", jb_compile_options_get_cflags(gres->group->compile_options),
"object-cflags", jb_compile_options_get_cflags(self->compile_options),
+ "stock-cflags", object_class->stock_cflags,
"package-ldflags", jb_compile_options_get_ldflags(jb_compile_options),
"group-ldflags", jb_compile_options_get_ldflags(gres->group->compile_options),
"object-ldflags", jb_compile_options_get_ldflags(self->compile_options),
"stock-ldflags", object_class->stock_ldflags,
+ "package-libs", jb_compile_options_get_libs(jb_compile_options),
+ "group-libs", jb_compile_options_get_libs(gres->group->compile_options),
+ "object-libs", jb_compile_options_get_libs(self->compile_options),
+ "stock-libs", object_class->stock_libs,
"outfile", outfile,
"object-files", object_files,
NULL);
@@ -2080,6 +2089,6 @@ jb_module_class_init (JBModuleClass *class)
oclass->type = "module";
oclass->stock_cflags = "-fPIC";
oclass->stock_cppflags = "-DPIC";
- oclass->stock_ldflags = "-shared -fPIC";
+ oclass->stock_ldflags = "-shared";
oclass->get_output_file = module_get_output_file;
}
diff --git a/jbsrc/lib/src/core/jb-resource.h b/jbsrc/lib/src/core/jb-resource.h
@@ -342,6 +342,7 @@ typedef struct
const char *stock_cflags;
const char *stock_cppflags;
const char *stock_ldflags;
+ const char *stock_libs;
char * (*get_output_file) (JBObject *self);
} JBObjectClass;
diff --git a/jbsrc/lib/src/core/jb-tests.c b/jbsrc/lib/src/core/jb-tests.c
@@ -208,9 +208,10 @@ jb_test_compile (const char *filename,
log_c_test(filename, "compile");
return jb_exec_expand(NULL, NULL,
- "$cc $cflags $extra-cflags"
+ "$cc -c -o build/test.o"
+ " $cflags $extra-cflags"
" $cppflags $extra-cppflags"
- " -o build/test.o -c $filename",
+ " $filename",
"extra-cflags", cflags,
"extra-cppflags", cppflags,
"filename", filename,
@@ -233,21 +234,25 @@ gboolean
jb_test_link (const char *filename,
const char *cflags,
const char *cppflags,
- const char *ldflags)
+ const char *ldflags,
+ const char *libs)
{
g_return_val_if_fail(filename != NULL, FALSE);
log_c_test(filename, "link");
return jb_exec_expand(NULL, NULL,
- "$cc $cflags $extra-cflags"
+ "$cc -o build/test"
+ " $cflags $extra-cflags"
" $cppflags $extra-cppflags"
" $ldflags $extra-ldflags"
- " -o build/test $filename",
+ " $filename"
+ " $libs $extra-libs",
+ "filename", filename,
"extra-cflags", cflags,
"extra-cppflags", cppflags,
"extra-ldflags", ldflags,
- "filename", filename,
+ "extra-libs", libs,
NULL);
}
@@ -255,24 +260,26 @@ gboolean
jb_test_link_string (const char *str,
const char *cflags,
const char *cppflags,
- const char *ldflags)
+ const char *ldflags,
+ const char *libs)
{
g_return_val_if_fail(str != NULL, FALSE);
jb_write_file_or_exit("build/test.c", str);
- return jb_test_link("build/test.c", cflags, cppflags, ldflags);
+ return jb_test_link("build/test.c", cflags, cppflags, ldflags, libs);
}
gboolean
jb_test_run (const char *filename,
const char *cflags,
const char *cppflags,
- const char *ldflags)
+ const char *ldflags,
+ const char *libs)
{
g_return_val_if_fail(filename != NULL, FALSE);
- if (! jb_test_link(filename, cflags, cppflags, ldflags))
+ if (! jb_test_link(filename, cflags, cppflags, ldflags, libs))
return FALSE;
return jb_exec(NULL, NULL, "build/test");
@@ -282,13 +289,14 @@ gboolean
jb_test_run_string (const char *str,
const char *cflags,
const char *cppflags,
- const char *ldflags)
+ const char *ldflags,
+ const char *libs)
{
g_return_val_if_fail(str != NULL, FALSE);
jb_write_file_or_exit("build/test.c", str);
- return jb_test_run("build/test.c", cflags, cppflags, ldflags);
+ return jb_test_run("build/test.c", cflags, cppflags, ldflags, libs);
}
gboolean
@@ -298,7 +306,7 @@ jb_check_functions (const char *functions, const char *libname)
int i;
GString *checking_message;
GString *program;
- char *ldflags = NULL;
+ char *libs = NULL;
gboolean result;
g_return_val_if_fail(functions != NULL, FALSE);
@@ -342,12 +350,12 @@ jb_check_functions (const char *functions, const char *libname)
g_string_append(program, " }\n");
if (libname)
- ldflags = g_strdup_printf("-l%s", libname);
+ libs = g_strdup_printf("-l%s", libname);
- result = jb_test_link_string(program->str, NULL, NULL, ldflags);
+ result = jb_test_link_string(program->str, NULL, NULL, NULL, libs);
g_string_free(program, TRUE);
- g_free(ldflags);
+ g_free(libs);
jb_message_result_bool(result);
@@ -361,7 +369,7 @@ jb_check_packages (const char *group_name,
{
char *quoted_packages;
char *cflags = NULL;
- char *ldflags = NULL;
+ char *libs = NULL;
char *error = NULL;
gboolean status;
@@ -379,15 +387,12 @@ jb_check_packages (const char *group_name,
status = jb_exec_expand(&cflags, NULL, "$pkg-config --cflags $packages",
"packages", quoted_packages,
NULL)
- && jb_exec_expand(&ldflags, NULL, "$pkg-config --libs $packages",
+ && jb_exec_expand(&libs, NULL, "$pkg-config --libs $packages",
"packages", quoted_packages,
NULL);
if (status)
- jb_variable_set_package_flags(varprefix,
- cflags,
- NULL,
- ldflags);
+ jb_variable_set_package_flags(varprefix, cflags, NULL, NULL, libs);
else
jb_exec_expand(NULL, &error, "$pkg-config --print-errors $packages",
"packages", quoted_packages,
@@ -395,7 +400,7 @@ jb_check_packages (const char *group_name,
g_free(quoted_packages);
g_free(cflags);
- g_free(ldflags);
+ g_free(libs);
jb_message_result_bool(status);
diff --git a/jbsrc/lib/src/core/jb-tests.h b/jbsrc/lib/src/core/jb-tests.h
@@ -40,20 +40,24 @@ gboolean jb_test_compile_string (const char *str,
gboolean jb_test_link (const char *filename,
const char *cflags,
const char *cppflags,
- const char *ldflags);
+ const char *ldflags,
+ const char *libs);
gboolean jb_test_link_string (const char *str,
const char *cflags,
const char *cppflags,
- const char *ldflags);
+ const char *ldflags,
+ const char *libs);
gboolean jb_test_run (const char *filename,
const char *cflags,
const char *cppflags,
- const char *ldflags);
+ const char *ldflags,
+ const char *libs);
gboolean jb_test_run_string (const char *str,
const char *cflags,
const char *cppflags,
- const char *ldflags);
+ const char *ldflags,
+ const char *libs);
gboolean jb_check_functions (const char *functions, const char *libname);
diff --git a/jbsrc/lib/src/core/jb-variable.c b/jbsrc/lib/src/core/jb-variable.c
@@ -415,11 +415,13 @@ void
jb_variable_set_package_flags (const char *name,
const char *cflags,
const char *cppflags,
- const char *ldflags)
+ const char *ldflags,
+ const char *libs)
{
char *cflags_var;
char *cppflags_var;
char *ldflags_var;
+ char *libs_var;
g_return_if_fail(name != NULL);
@@ -434,6 +436,10 @@ jb_variable_set_package_flags (const char *name,
ldflags_var = g_strdup_printf("%s-ldflags", name);
jb_variable_set_string(ldflags_var, ldflags);
g_free(ldflags_var);
+
+ libs_var = g_strdup_printf("%s-libs", name);
+ jb_variable_set_string(libs_var, libs);
+ g_free(libs_var);
}
gboolean
diff --git a/jbsrc/lib/src/core/jb-variable.h b/jbsrc/lib/src/core/jb-variable.h
@@ -126,7 +126,8 @@ void jb_variable_set_mode (const char *name, mode_t value);
void jb_variable_set_package_flags (const char *name,
const char *cflags,
const char *cppflags,
- const char *ldflags);
+ const char *ldflags,
+ const char *libs);
gboolean jb_variable_set_from_string (JBVariable *self,
const char *value,
diff --git a/jbsrc/lib/src/extras/jb-evolution-plugin.c b/jbsrc/lib/src/extras/jb-evolution-plugin.c
@@ -17,16 +17,26 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <string.h>
#include "jb-tests.h"
#include "jb-util.h"
#include "jb-variable.h"
+void
+jb_evolution_plugin_init (void)
+{
+ jb_variable_add_string("evolution-plugin-dir",
+ "Evolution plugin installation directory",
+ jb_variable_group_installation_options,
+ 0,
+ "autodetect");
+}
+
gboolean
jb_evolution_plugin_check (const char *minversion)
{
char *packages;
gboolean result;
- char *plugindir;
if (! minversion)
minversion = "2.12";
@@ -38,15 +48,20 @@ jb_evolution_plugin_check (const char *minversion)
if (! result)
return FALSE;
- jb_message_checking("for the Evolution plugin directory");
- plugindir = jb_get_package_variable("evolution-plugin", "plugindir");
- jb_message_result_string(plugindir ? plugindir : "not found");
+ if (! strcmp(jb_variable_get_string("evolution-plugin-dir"), "autodetect"))
+ {
+ char *plugindir;
- if (! plugindir)
- return FALSE;
+ jb_message_checking("for the Evolution plugin directory");
+ plugindir = jb_get_package_variable("evolution-plugin", "plugindir");
+ jb_message_result_string(plugindir ? plugindir : "not found");
+
+ if (! plugindir)
+ return FALSE;
- jb_variable_set_string("evolution-plugindir", plugindir);
- g_free(plugindir);
+ jb_variable_set_string("evolution-plugin-dir", plugindir);
+ g_free(plugindir);
+ }
return TRUE;
}
diff --git a/jbsrc/lib/src/extras/jb-evolution-plugin.h b/jbsrc/lib/src/extras/jb-evolution-plugin.h
@@ -22,6 +22,7 @@
#include <glib.h>
+void jb_evolution_plugin_init (void);
gboolean jb_evolution_plugin_check (const char *minversion);
#endif /* _JB_EVOLUTION_PLUGIN_H */
diff --git a/jbsrc/lib/src/extras/jb-openssl.c b/jbsrc/lib/src/extras/jb-openssl.c
@@ -24,7 +24,8 @@
#define JB_OPENSSL_CFLAGS NULL
#define JB_OPENSSL_CPPFLAGS NULL
-#define JB_OPENSSL_LDFLAGS "-lssl -lcrypto"
+#define JB_OPENSSL_LDFLAGS NULL
+#define JB_OPENSSL_LIBS "-lssl -lcrypto"
gboolean
jb_openssl_check (const char *minversion)
@@ -63,7 +64,8 @@ jb_openssl_check (const char *minversion)
"}\n",
JB_OPENSSL_CFLAGS,
cppflags,
- JB_OPENSSL_LDFLAGS);
+ JB_OPENSSL_LDFLAGS,
+ JB_OPENSSL_LIBS);
g_free(cppflags);
@@ -73,7 +75,8 @@ jb_openssl_check (const char *minversion)
jb_variable_set_package_flags("openssl",
JB_OPENSSL_CFLAGS,
JB_OPENSSL_CPPFLAGS,
- JB_OPENSSL_LDFLAGS);
+ JB_OPENSSL_LDFLAGS,
+ JB_OPENSSL_LIBS);
return result;
}
diff --git a/jbsrc/lib/src/extras/jb-sasl2.c b/jbsrc/lib/src/extras/jb-sasl2.c
@@ -24,7 +24,8 @@
#define JB_SASL2_CFLAGS NULL
#define JB_SASL2_CPPFLAGS NULL
-#define JB_SASL2_LDFLAGS "-lsasl2"
+#define JB_SASL2_LDFLAGS NULL
+#define JB_SASL2_LIBS "-lsasl2"
gboolean
jb_sasl2_check (const char *minversion)
@@ -58,7 +59,8 @@ jb_sasl2_check (const char *minversion)
"}\n",
JB_SASL2_CFLAGS,
cppflags,
- JB_SASL2_LDFLAGS);
+ JB_SASL2_LDFLAGS,
+ JB_SASL2_LIBS);
g_free(cppflags);
@@ -68,7 +70,8 @@ jb_sasl2_check (const char *minversion)
jb_variable_set_package_flags("sasl2",
JB_SASL2_CFLAGS,
JB_SASL2_CPPFLAGS,
- JB_SASL2_LDFLAGS);
+ JB_SASL2_LDFLAGS,
+ JB_SASL2_LIBS);
return result;
}
diff --git a/jbsrc/tools/config.guess b/jbsrc/tools/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@ EOF
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff --git a/jbsrc/tools/config.sub b/jbsrc/tools/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -683,6 +683,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
diff --git a/jbsrc/tools/intltool-merge.in b/jbsrc/tools/intltool-merge.in
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.36.2";
+my $VERSION = "0.37.1";
## Loaded modules
use strict;
@@ -61,6 +61,7 @@ my $DESKTOP_STYLE_ARG = 0;
my $SCHEMAS_STYLE_ARG = 0;
my $RFC822DEB_STYLE_ARG = 0;
my $QUOTED_STYLE_ARG = 0;
+my $QUOTEDXML_STYLE_ARG = 0;
my $QUIET_ARG = 0;
my $PASS_THROUGH_ARG = 0;
my $UTF8_ARG = 0;
@@ -81,6 +82,7 @@ GetOptions
"schemas-style|s" => \$SCHEMAS_STYLE_ARG,
"rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
"quoted-style" => \$QUOTED_STYLE_ARG,
+ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
"pass-through|p" => \$PASS_THROUGH_ARG,
"utf8|u" => \$UTF8_ARG,
"multiple-output|m" => \$MULTIPLE_OUTPUT,
@@ -148,7 +150,7 @@ elsif ($KEYS_STYLE_ARG && @ARGV > 2)
&utf8_sanity_check;
&preparation;
&print_message;
- &keys_merge_translations;
+ &keys_merge_translations;
&finalize;
}
elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
@@ -174,12 +176,12 @@ elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2)
&rfc822deb_merge_translations;
&finalize;
}
-elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
+elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
{
&utf8_sanity_check;
&preparation;
&print_message;
- "ed_merge_translations;
+ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
&finalize;
}
else
@@ -219,6 +221,7 @@ Mandatory options: (exactly one must be specified)
-s, --schemas-style includes translations in the schemas style
-r, --rfc822deb-style includes translations in the RFC822 style
--quoted-style includes translations in the quoted string style
+ --quotedxml-style includes translations in the quoted xml string style
-x, --xml-style includes translations in the standard xml style
Other options:
@@ -292,10 +295,9 @@ sub gather_po_files
{
next if /^#/;
- if (/([-a-zA-Z_@.]+)\n/)
+ for my $lang (split)
{
- my $lang = $1;
-
+ chomp ($lang);
my $po_file = $PO_DIR . "/" . $lang . ".po";
if (-e $po_file) {
$po_files_by_lang{$lang} = $po_file;
@@ -576,6 +578,7 @@ sub entity_encode_int_minimalist
return "&" if $_ == 38;
return "'" if $_ == 39;
return "<" if $_ == 60;
+ return ">" if $_ == 62;
return chr $_;
}
@@ -1076,43 +1079,74 @@ sub xml_merge_output
close OUTPUT;
print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
}
- }
- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
- binmode (OUTPUT) if $^O eq 'MSWin32';
- my $tree = readXml($FILE);
- print_header($FILE, \*OUTPUT);
- parseTree(\*OUTPUT, $tree);
- close OUTPUT;
- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
+ if ( ! -d "C" ) {
+ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
+ }
+ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ my $tree = readXml($FILE);
+ print_header($FILE, \*OUTPUT);
+ parseTree(\*OUTPUT, $tree);
+ close OUTPUT;
+ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
+ } else {
+ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ my $tree = readXml($FILE);
+ print_header($FILE, \*OUTPUT);
+ parseTree(\*OUTPUT, $tree);
+ close OUTPUT;
+ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
+ }
}
-sub keys_merge_translations
+sub keys_merge_translation
{
- open INPUT, "<${FILE}" or die;
- open OUTPUT, ">${OUTFILE}" or die;
+ my ($lang) = @_;
+
+ if ( ! -d $lang && $MULTIPLE_OUTPUT)
+ {
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+ }
+
+ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
binmode (OUTPUT) if $^O eq 'MSWin32';
- while (<INPUT>)
+ while (<INPUT>)
{
- if (s/^(\s*)_(\w+=(.*))/$1$2/)
+ if (s/^(\s*)_(\w+=(.*))/$1$2/)
{
- my $string = $3;
+ my $string = $3;
- print OUTPUT;
+ if (!$MULTIPLE_OUTPUT)
+ {
+ print OUTPUT;
- my $non_translated_line = $_;
+ my $non_translated_line = $_;
- for my $lang (sort keys %po_files_by_lang)
+ for my $lang (sort keys %po_files_by_lang)
+ {
+ my $translation = $translations{$lang, $string};
+ next if !$translation;
+
+ $_ = $non_translated_line;
+ s/(\w+)=.*/[$lang]$1=$translation/;
+ print OUTPUT;
+ }
+ }
+ else
{
- my $translation = $translations{$lang, $string};
- next if !$translation;
+ my $non_translated_line = $_;
+ my $translation = $translations{$lang, $string};
+ $translation = $string if !$translation;
$_ = $non_translated_line;
- s/(\w+)=.*/[$lang]$1=$translation/;
+ s/(\w+)=.*/$1=$translation/;
print OUTPUT;
}
- }
- else
+ }
+ else
{
print OUTPUT;
}
@@ -1120,6 +1154,24 @@ sub keys_merge_translations
close OUTPUT;
close INPUT;
+
+ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
+}
+
+sub keys_merge_translations
+{
+ if ($MULTIPLE_OUTPUT)
+ {
+ for my $lang (sort keys %po_files_by_lang)
+ {
+ keys_merge_translation ($lang);
+ }
+ keys_merge_translation ("C");
+ }
+ else
+ {
+ keys_merge_translation (".");
+ }
}
sub desktop_merge_translations
@@ -1415,19 +1467,22 @@ sub rfc822deb_split
sub quoted_translation
{
- my ($lang, $string) = @_;
+ my ($xml_mode, $lang, $string) = @_;
+ $string = entity_decode($string) if $xml_mode;
$string =~ s/\\\"/\"/g;
my $translation = $translations{$lang, $string};
$translation = $string if !$translation;
-
+ $translation = entity_encode($translation) if $xml_mode;
$translation =~ s/\"/\\\"/g;
return $translation
}
sub quoted_merge_translations
{
+ my ($xml_mode) = @_;
+
if (!$MULTIPLE_OUTPUT) {
print "Quoted only supports Multiple Output.\n";
exit(1);
@@ -1442,7 +1497,7 @@ sub quoted_merge_translations
binmode (OUTPUT) if $^O eq 'MSWin32';
while (<INPUT>)
{
- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
print OUTPUT;
}
close OUTPUT;
diff --git a/po/cs.po b/po/cs.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: mail-notification 4.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-06-19 08:41+0200\n"
-"PO-Revision-Date: 2007-06-26 12:06+0200\n"
+"PO-Revision-Date: 2008-04-27 16:45+0200\n"
"Last-Translator: Pav Lucistnik <pav@FreeBSD.org>\n"
"Language-Team: Pav Lucistnik <pav@FreeBSD.org>\n"
"MIME-Version: 1.0\n"
@@ -1782,11 +1782,11 @@ msgstr "_Aktualizovat stav pošty"
#: ../ui/properties-dialog.glade.h:39
msgid "icon tooltip's mail summary layout|Co_mpact"
-msgstr "rozložení souhrnu pošty v tooltipu ikony|_Kompaktní"
+msgstr "_Kompaktní"
#: ../ui/properties-dialog.glade.h:40
msgid "icon tooltip's mail summary layout|_Standard"
-msgstr "rozložení souhrnu pošty v tooltipu ikony|_Standardní"
+msgstr "_Standardní"
#~ msgid "server did not send all the messages we requested"
#~ msgstr "server neposlal všechny zprávy, které jsme vyžádali"
diff --git a/po/es.po b/po/es.po
@@ -8,10 +8,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 5.2\n"
+"Project-Id-Version: mail-notification 5.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-28 10:06+0100\n"
-"PO-Revision-Date: 2008-03-20 16:52+0100\n"
+"POT-Creation-Date: 2008-04-25 10:12+0200\n"
+"PO-Revision-Date: 2008-04-27 16:51+0200\n"
"Last-Translator: Nacho Hermoso de Mendoza <gnacho@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,11 +25,8 @@ msgid "Configure Mail Notification"
msgstr "Configurar Notificación de correo"
#: ../data/mail-notification-properties.desktop.in.h:2
-#: ../data/mail-notification.desktop.in.h:2
-#: ../src/mn-mail-icon.gob:296
-#: ../src/mn-main.c:103
-#: ../src/mn-main.c:424
-#: ../src/mn-main.c:445
+#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:296
+#: ../src/mn-main.c:103 ../src/mn-main.c:424 ../src/mn-main.c:445
#: ../src/mn-main.c:496
msgid "Mail Notification"
msgstr "Notificación de correo"
@@ -79,8 +76,13 @@ msgid "Height of properties dialog"
msgstr "Altura del diálogo de propiedades"
#: ../data/mail-notification.schemas.in.in.h:11
-msgid "If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the number of seconds to wait before expiring message popups."
-msgstr "Si /apps/mail-notification/popups/expiration/enabled está fijado en \"verdadero\", el número de segundos antes de que expiren los mensajes emergentes."
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"number of seconds to wait before expiring message popups."
+msgstr ""
+"Si /apps/mail-notification/popups/expiration/enabled está fijado en "
+"\"verdadero\", el número de segundos antes de que expiren los mensajes "
+"emergentes."
#: ../data/mail-notification.schemas.in.in.h:12
msgid "Mail changed command"
@@ -139,8 +141,14 @@ msgid "Seconds to wait before expiring message popups"
msgstr "Segundos antes de cerrar los mensajes emergentes"
#: ../data/mail-notification.schemas.in.in.h:26
-msgid "The action to perform when the icon is clicked. Must be \"launch-mail-reader\", \"open-latest-message\", \"consider-new-mail-as-read\" or \"update-mail-status\"."
-msgstr "La acción a ejecutar cuando se hace clic en el icono. Tiene que ser \"mostrar-diálogo-de-propiedades\", \"lanzar-el-cliente-de-correo\" o \"actualizar-el estado-de-correo\"."
+msgid ""
+"The action to perform when the icon is clicked. Must be \"launch-mail-reader"
+"\", \"open-latest-message\", \"consider-new-mail-as-read\" or \"update-mail-"
+"status\"."
+msgstr ""
+"La acción a ejecutar cuando se hace clic en el icono. Tiene que ser "
+"\"mostrar-diálogo-de-propiedades\", \"lanzar-el-cliente-de-correo\" o "
+"\"actualizar-el estado-de-correo\"."
#: ../data/mail-notification.schemas.in.in.h:27
msgid "The command to run when all mail is read."
@@ -156,48 +164,90 @@ msgstr "El comando a ejecutar cuando cambia la lista de mensajes."
#: ../data/mail-notification.schemas.in.in.h:31
#, no-c-format
-msgid "The command to use to play a sound file. The string %file will be substituted with the filename of the sound to play."
-msgstr "Comando a utilizar para reproducir un archivo de sonido. La cadena %file será sustituida por el nombre de archivo del sonido a reproducir."
+msgid ""
+"The command to use to play a sound file. The string %file will be "
+"substituted with the filename of the sound to play."
+msgstr ""
+"Comando a utilizar para reproducir un archivo de sonido. La cadena %file "
+"será sustituida por el nombre de archivo del sonido a reproducir."
#: ../data/mail-notification.schemas.in.in.h:32
msgid "The height of the properties dialog in pixels."
msgstr "La altura del diálogo de propiedades en píxels."
#: ../data/mail-notification.schemas.in.in.h:33
-msgid "The list of character sets to attempt conversion from when uncompliant 8-bit data is encountered in message headers. The first character set allowing a successful conversion will be used. The special name \"user\" will be replaced with the character set of the user's locale. Note that Mail Notification must be restarted for changes to take effect."
-msgstr "Cuando se encuentren datos de 8 bits no estándares en la cabecera del mensaje, se intentará convertir al juego de caracteres por defecto. Se utilizará el primer juego de caracteres que permita una conversión con éxito. El nombre especial \"user\" se reemplazará con el juego de caracteres del usuario local. Notificación de correo deberá ser reiniciado para que los cambios surjan efecto."
+msgid ""
+"The list of character sets to attempt conversion from when uncompliant 8-bit "
+"data is encountered in message headers. The first character set allowing a "
+"successful conversion will be used. The special name \"user\" will be "
+"replaced with the character set of the user's locale. Note that Mail "
+"Notification must be restarted for changes to take effect."
+msgstr ""
+"Cuando se encuentren datos de 8 bits no estándares en la cabecera del "
+"mensaje, se intentará convertir al juego de caracteres por defecto. Se "
+"utilizará el primer juego de caracteres que permita una conversión con "
+"éxito. El nombre especial \"user\" se reemplazará con el juego de caracteres "
+"del usuario local. Notificación de correo deberá ser reiniciado para que los "
+"cambios surjan efecto."
#: ../data/mail-notification.schemas.in.in.h:34
-msgid "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 certificate."
-msgstr "Lista de servidores confiables SSL/TLS (servidor:puerto) sin certificado X509."
+msgid ""
+"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
+"certificate."
+msgstr ""
+"Lista de servidores confiables SSL/TLS (servidor:puerto) sin certificado "
+"X509."
#: ../data/mail-notification.schemas.in.in.h:35
-msgid "The list of trusted X509 certificates, represented by their MD5 fingerprint."
-msgstr "Lista de certificados X509 confiables, representados por las huellas digitales MD5."
+msgid ""
+"The list of trusted X509 certificates, represented by their MD5 fingerprint."
+msgstr ""
+"Lista de certificados X509 confiables, representados por las huellas "
+"digitales MD5."
#: ../data/mail-notification.schemas.in.in.h:36
msgid "The maximum number of messages to display in the tooltip mail summary."
-msgstr "El número máximo de mensajes mostrados en el tooltip del sumario de correo."
+msgstr ""
+"El número máximo de mensajes mostrados en el tooltip del sumario de correo."
#: ../data/mail-notification.schemas.in.in.h:37
-msgid "The maximum number of popups to display simultaneously. If this limit is exceeded, only the most recent messages will be displayed. If the /apps/mail-notification/popups/position key is set to \"attached\", this limit will be ignored and only one popup will be allowed."
-msgstr "Número máximo de emergentes mostrados simultáneamente. Si se excede este límite, solo se mostrarán los mensajes mas recientes. Si la clave /apps/mail-notification/popups/position está en \"attached\", este límite se ignorará y se solo se permitirá un emergente."
+msgid ""
+"The maximum number of popups to display simultaneously. If this limit is "
+"exceeded, only the most recent messages will be displayed. If the /apps/mail-"
+"notification/popups/position key is set to \"attached\", this limit will be "
+"ignored and only one popup will be allowed."
+msgstr ""
+"Número máximo de emergentes mostrados simultáneamente. Si se excede este "
+"límite, solo se mostrarán los mensajes mas recientes. Si la clave /apps/mail-"
+"notification/popups/position está en \"attached\", este límite se ignorará y "
+"se solo se permitirá un emergente."
#: ../data/mail-notification.schemas.in.in.h:38
-msgid "The ordered list of actions to include in the message popups. Each element must be \"open\", \"mark-as-read\", \"mark-as-spam\" or \"delete\"."
-msgstr "La lista ordenada de acciones a incluir en los mensajes emergentes. Cada elemento debe ser \"abrir\", \"marcar-como-leído\", \"marcar-como-spam\" o \"eliminar\"."
+msgid ""
+"The ordered list of actions to include in the message popups. Each element "
+"must be \"open\", \"mark-as-read\", \"mark-as-spam\" or \"delete\"."
+msgstr ""
+"La lista ordenada de acciones a incluir en los mensajes emergentes. Cada "
+"elemento debe ser \"abrir\", \"marcar-como-leído\", \"marcar-como-spam\" o "
+"\"eliminar\"."
#: ../data/mail-notification.schemas.in.in.h:39
msgid "The position of the message popups. Must be \"attached\" or \"free\"."
-msgstr "La posición de los mensajes emergentes. Tiene que ser \"adjunto\" o \"libre\"."
+msgstr ""
+"La posición de los mensajes emergentes. Tiene que ser \"adjunto\" o \"libre"
+"\"."
#: ../data/mail-notification.schemas.in.in.h:40
msgid "The sound file to play when new mail arrives."
msgstr "Sonido a reproducir cuando llega correo nuevo."
#: ../data/mail-notification.schemas.in.in.h:41
-msgid "The type of mail summary to display in the icon's tooltip. Must be \"standard\", \"compact\" or \"none\"."
-msgstr "El tipo de resumen de correo que se mostrará como un consejo del icono. Tiene que ser \"estandar\", \"compacto\" o \"ninguno\"."
+msgid ""
+"The type of mail summary to display in the icon's tooltip. Must be \"standard"
+"\", \"compact\" or \"none\"."
+msgstr ""
+"El tipo de resumen de correo que se mostrará como un consejo del icono. "
+"Tiene que ser \"estandar\", \"compacto\" o \"ninguno\"."
#: ../data/mail-notification.schemas.in.in.h:42
msgid "The width of the properties dialog in pixels."
@@ -217,23 +267,31 @@ msgstr "Hacer o no hacer que el icono parpadee cuando hay errores."
#: ../data/mail-notification.schemas.in.in.h:46
msgid "Whether to display a message count in the status icon or not."
-msgstr "Mostrar o no mostrar mensaje con número de objetos en el icono de estado."
+msgstr ""
+"Mostrar o no mostrar mensaje con número de objetos en el icono de estado."
#: ../data/mail-notification.schemas.in.in.h:47
msgid "Whether to display an icon when there is no new mail or not."
msgstr "Mostrar o no mostrar un icono cuando no hay correo nuevo."
#: ../data/mail-notification.schemas.in.in.h:48
-msgid "Whether to display mail which is still marked as unread but has been seen or not."
-msgstr "Mostrar o no mostrar el correo marcado como no leído pero que ha sido visto."
+msgid ""
+"Whether to display mail which is still marked as unread but has been seen or "
+"not."
+msgstr ""
+"Mostrar o no mostrar el correo marcado como no leído pero que ha sido visto."
#: ../data/mail-notification.schemas.in.in.h:49
msgid "Whether to enable message popups or not."
msgstr "Habilitar o no habilitar los mensajes emergentes."
#: ../data/mail-notification.schemas.in.in.h:50
-msgid "Whether to expire message popups or not. Must be \"default\", \"false\" or \"true\"."
-msgstr "Terminar o no terminar mensajes emergentes. Debe de ser \"predeterminado\", \"falso\" o \"verdadero\"."
+msgid ""
+"Whether to expire message popups or not. Must be \"default\", \"false\" or "
+"\"true\"."
+msgstr ""
+"Terminar o no terminar mensajes emergentes. Debe de ser \"predeterminado\", "
+"\"falso\" o \"verdadero\"."
#: ../data/mail-notification.schemas.in.in.h:51
msgid "Whether to play a sound when new mail arrives or not."
@@ -306,11 +364,13 @@ msgstr "Recuperando contraseña del anillo de claves..."
#: ../src/mn-authenticated-mailbox.gob:306
#, c-format
msgid ""
-"Mail Notification was unable to log into %s mailbox %s, possibly because the password you have entered is invalid.\n"
+"Mail Notification was unable to log into %s mailbox %s, possibly because the "
+"password you have entered is invalid.\n"
"\n"
"Please re-enter your password."
msgstr ""
-"Notificación de correo no puede entrar al buzón %s %s, posiblemente porque la contraseña introducida no es válida.\n"
+"Notificación de correo no puede entrar al buzón %s %s, posiblemente porque "
+"la contraseña introducida no es válida.\n"
"\n"
"Por favor, introduce de nuevo la contraseña."
@@ -334,7 +394,8 @@ msgstr "No se puede guardar la contraseña de los buzones"
#: ../src/mn-authenticated-mailbox.gob:465
#, c-format
msgid "The password of %s mailbox %s could not be saved to the keyring."
-msgstr "La contraseña del buzón %s %s no se pudo guardar en el anillo de claves."
+msgstr ""
+"La contraseña del buzón %s %s no se pudo guardar en el anillo de claves."
#. translators: header capitalization
#: ../src/mn-autodetect-mailbox-properties.gob:119
@@ -427,16 +488,19 @@ msgstr "nombre de servidor no encontrado en el certificado"
#: ../src/mn-client-session.c:631
#, c-format
-msgid "user-provided server name \"%s\" does not match certificate-provided server name \"%s\""
-msgstr "el nombre del servidor \"%s\" proporcionado por el usuario no coincide con el nombre del servidor \"%s\" proporcionado por el certificado"
+msgid ""
+"user-provided server name \"%s\" does not match certificate-provided server "
+"name \"%s\""
+msgstr ""
+"el nombre del servidor \"%s\" proporcionado por el usuario no coincide con "
+"el nombre del servidor \"%s\" proporcionado por el certificado"
#: ../src/mn-client-session.c:645
#, c-format
msgid "\"%s\", "
msgstr "\"%s\", "
-#: ../src/mn-client-session.c:647
-#: ../src/mn-client-session.c:1582
+#: ../src/mn-client-session.c:647 ../src/mn-client-session.c:1582
#: ../src/mn-yahoo-mailbox.gob:218
#, c-format
msgid "\"%s\""
@@ -444,8 +508,12 @@ msgstr "\"%s\""
#: ../src/mn-client-session.c:650
#, c-format
-msgid "user-provided server name \"%s\" matches none of the certificate-provided server names %s"
-msgstr "el nombre del servidor \"%s\" proporcionado por el usuario no coincide con ninguno de los nombres de servidores \"%s\" proporcionados por el certificado"
+msgid ""
+"user-provided server name \"%s\" matches none of the certificate-provided "
+"server names %s"
+msgstr ""
+"el nombre del servidor \"%s\" proporcionado por el usuario no coincide con "
+"ninguno de los nombres de servidores \"%s\" proporcionados por el certificado"
#: ../src/mn-client-session.c:740
#, c-format
@@ -476,8 +544,7 @@ msgstr "servidor no confiable"
msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
msgstr "una capa SSL/TLS está ahora activa (%s, %s %i-bit)"
-#: ../src/mn-client-session.c:819
-#: ../src/mn-client-session.c:826
+#: ../src/mn-client-session.c:819 ../src/mn-client-session.c:826
#, c-format
msgid "unable to read from server: %s"
msgstr "no se puede leer desde el servidor: %s"
@@ -496,8 +563,7 @@ msgstr "no se pueden descifrar los datos usando SASL: %s"
msgid "unable to encode data using SASL: %s"
msgstr "no se puede codificar los datos usando SASL: %s"
-#: ../src/mn-client-session.c:1009
-#: ../src/mn-client-session.c:1016
+#: ../src/mn-client-session.c:1009 ../src/mn-client-session.c:1016
#, c-format
msgid "unable to write to server: %s"
msgstr "no se puede escribir en el servidor: %s"
@@ -506,8 +572,7 @@ msgstr "no se puede escribir en el servidor: %s"
msgid "unable to write to server: EOF"
msgstr "no se puede escribir en el servidor: EOF"
-#: ../src/mn-client-session.c:1043
-#: ../src/mn-pop3-mailbox.gob:448
+#: ../src/mn-client-session.c:1043 ../src/mn-pop3-mailbox.gob:448
#, c-format
msgid "unable to encode Base64: %s"
msgstr "no se puede codificar Base64: %s"
@@ -533,8 +598,11 @@ msgid "unable to set SASL security properties: %s"
msgstr "no se pueden ajustar las propiedades de seguridad SASL: %s"
#: ../src/mn-client-session.c:1296
-msgid "unable to start SASL authentication: SASL asked for something we did not know"
-msgstr "no se puede iniciar la autenticación SASL: SASL ha preguntado algo que no sabíamos"
+msgid ""
+"unable to start SASL authentication: SASL asked for something we did not know"
+msgstr ""
+"no se puede iniciar la autenticación SASL: SASL ha preguntado algo que no "
+"sabíamos"
#: ../src/mn-client-session.c:1315
#, c-format
@@ -548,7 +616,8 @@ msgstr "no se puede crear una conexión SASL: %s"
#: ../src/mn-client-session.c:1366
msgid "SASL asked for something we did not know, aborting SASL authentication"
-msgstr "SASL ha preguntado algo que no sabíamos, abortando la autenticación SASL"
+msgstr ""
+"SASL ha preguntado algo que no sabíamos, abortando la autenticación SASL"
#: ../src/mn-client-session.c:1383
#, c-format
@@ -600,11 +669,17 @@ msgstr "Enviado"
#: ../src/mn-conf.c:249
#, c-format
msgid "cannot find default value of configuration key \"%s\""
-msgstr "no se puede encontrar el valor predeterminado de la clave de configuración \"%s\""
+msgstr ""
+"no se puede encontrar el valor predeterminado de la clave de configuración "
+"\"%s\""
#: ../src/mn-conf.c:254
-msgid "The default configuration has not been installed properly. Please check your Mail Notification installation."
-msgstr "La configuración por defecto no ha sido instalada correctamente. Por favor, comprueba la instalación de Notificación de correo."
+msgid ""
+"The default configuration has not been installed properly. Please check your "
+"Mail Notification installation."
+msgstr ""
+"La configuración por defecto no ha sido instalada correctamente. Por favor, "
+"comprueba la instalación de Notificación de correo."
#: ../src/mn-conf.c:291
msgid "A directory creation error has occurred"
@@ -633,8 +708,14 @@ msgid "invalid location"
msgstr "ubicación inválida"
#: ../src/mn-evolution-folder-tree-client.gob:269
-msgid "Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Jean-Yves Lefort's Mail Notification plugin is loaded."
-msgstr "Notificación de correo no puede contactar con Evolution. Comprueba que Evolution está en ejecución y que está cargado el conector con Notificación de correo."
+msgid ""
+"Mail Notification can not contact Evolution. Make sure that Evolution is "
+"running and that the Evolution Jean-Yves Lefort's Mail Notification plugin "
+"is loaded."
+msgstr ""
+"Notificación de correo no puede contactar con Evolution. Comprueba que "
+"Evolution está en ejecución y que está cargado el conector con Notificación "
+"de correo."
#. translators: header capitalization
#: ../src/mn-evolution-mailbox-properties.gob:71
@@ -648,21 +729,20 @@ msgstr "no se puede contactar con Evolution"
#: ../src/mn-evolution-plugin.c:151
msgid "A fatal error has occurred in the Evolution Mail Notification plugin"
-msgstr "Se ha producido un error fatal en el conector para Evolution del Notificación de correo"
+msgstr ""
+"Se ha producido un error fatal en el conector para Evolution del "
+"Notificación de correo"
-#: ../src/mn-evolution-plugin.c:152
-#: ../src/mn-main.c:250
+#: ../src/mn-evolution-plugin.c:152 ../src/mn-main.c:250
msgid "The connection to the D-Bus session bus was lost."
msgstr "Se ha perdido la conexión con D-Bus session."
-#: ../src/mn-evolution-plugin.c:175
-#: ../src/mn-evolution-plugin.c:188
+#: ../src/mn-evolution-plugin.c:175 ../src/mn-evolution-plugin.c:188
#: ../src/mn-evolution-plugin.c:226
msgid "Unable to initialize the Mail Notification plugin"
msgstr "No se puede iniciar el conector de Notificación de correo"
-#: ../src/mn-evolution-plugin.c:176
-#: ../src/mn-main.c:270
+#: ../src/mn-evolution-plugin.c:176 ../src/mn-main.c:270
#, c-format
msgid "Unable to connect to the D-Bus session bus: %s."
msgstr "No se puede conectar con D-Bus session bus: %s"
@@ -670,7 +750,8 @@ msgstr "No se puede conectar con D-Bus session bus: %s"
#: ../src/mn-evolution-plugin.c:227
#, c-format
msgid "Unable to register the Mail Notification Evolution D-Bus server: %s."
-msgstr "No se puede registrar el Evolution D-Bus server de Notificación de correo: %s"
+msgstr ""
+"No se puede registrar el Evolution D-Bus server de Notificación de correo: %s"
#: ../src/mn-evolution-server.gob:152
#, c-format
@@ -720,8 +801,7 @@ msgid_plural "feed retrieved successfully (%i bytes)"
msgstr[0] "feed recuperado con éxito (%i byte)"
msgstr[1] "feed recuperado con éxito (%i bytes)"
-#: ../src/mn-gmail-mailbox.gob:203
-#: ../src/mn-gmail-mailbox.gob:254
+#: ../src/mn-gmail-mailbox.gob:203 ../src/mn-gmail-mailbox.gob:254
msgid "unable to parse feed"
msgstr "no se puede analizar el feed"
@@ -731,8 +811,7 @@ msgstr "no se puede analizar el feed"
msgid "unable to read %s: %s"
msgstr "no se puede leer %s: %s"
-#: ../src/mn-gmime-stream-vfs.gob:50
-#: ../src/mn-webmail-mailbox.gob:141
+#: ../src/mn-gmime-stream-vfs.gob:50 ../src/mn-webmail-mailbox.gob:141
#, c-format
msgid "unable to write to %s: %s"
msgstr "no se puede escribir en %s: %s"
@@ -747,15 +826,13 @@ msgstr "no se puede buscar en %s: %s"
msgid "unable to tell position of %s: %s"
msgstr "no se puede fijar la posición de %s: %s"
-#: ../src/mn-gmime-stream-vfs.gob:56
-#: ../src/mn-mh-mailbox-backend.gob:206
+#: ../src/mn-gmime-stream-vfs.gob:56 ../src/mn-mh-mailbox-backend.gob:216
#: ../src/mn-webmail-mailbox.gob:147
#, c-format
msgid "unable to close %s: %s"
msgstr "no se puede cerrar %s: %s"
-#: ../src/mn-hotmail-mailbox.gob:286
-#: ../src/mn-imap-mailbox.gob:1680
+#: ../src/mn-hotmail-mailbox.gob:286 ../src/mn-imap-mailbox.gob:1680
#: ../src/mn-pop3-mailbox.gob:1165
msgid "authentication failed"
msgstr "la autenticación ha fallado"
@@ -799,15 +876,20 @@ msgstr "el servidor no ha enviado las capacidades"
#: ../src/mn-imap-mailbox.gob:551
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
-msgstr "el servidor ha avisado LOGINDISABLED, no se usará la autenticación LOGIN"
+msgstr ""
+"el servidor ha avisado LOGINDISABLED, no se usará la autenticación LOGIN"
#: ../src/mn-imap-mailbox.gob:552
msgid "unable to login"
msgstr "no se puede entrar"
#: ../src/mn-imap-mailbox.gob:1063
-msgid "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, logging out"
-msgstr "\"Utiliza la extensión IDLE\" poner en \"nunca\" en las propiedades del buzón, saliendo"
+msgid ""
+"\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
+"logging out"
+msgstr ""
+"\"Utiliza la extensión IDLE\" poner en \"nunca\" en las propiedades del "
+"buzón, saliendo"
#: ../src/mn-imap-mailbox.gob:1074
#, c-format
@@ -816,41 +898,45 @@ msgstr "el servidor remoto ejecuta %s, no se usará la extensión IDLE"
#: ../src/mn-imap-mailbox.gob:1079
#, c-format
-msgid "the remote server runs %s, the IDLE extension might not function properly"
-msgstr "el servidor remoto ejecuta %s, la extensión IDLE podría no funcionar correctamente"
+msgid ""
+"the remote server runs %s, the IDLE extension might not function properly"
+msgstr ""
+"el servidor remoto ejecuta %s, la extensión IDLE podría no funcionar "
+"correctamente"
#: ../src/mn-imap-mailbox.gob:1088
msgid "the remote server does not support the IDLE extension, logging out"
msgstr "el servidor remoto no soporta la extensión IDLE, saliendo"
-#: ../src/mn-imap-mailbox.gob:1590
-#: ../src/mn-pop3-mailbox.gob:309
+#: ../src/mn-imap-mailbox.gob:1590 ../src/mn-pop3-mailbox.gob:309
msgid "server does not support in-band SSL/TLS"
msgstr "el servidor no soporta SSL/TLS en banda"
-#: ../src/mn-imap-mailbox.gob:1614
-#: ../src/mn-pop3-mailbox.gob:1080
-msgid "a SASL authentication mechanism was selected but SASL support has not been compiled in"
-msgstr "se ha seleccionado un mecanismo de autenticación SASL, pero el soporte de SASL no está disponible"
+#: ../src/mn-imap-mailbox.gob:1614 ../src/mn-pop3-mailbox.gob:1080
+msgid ""
+"a SASL authentication mechanism was selected but SASL support has not been "
+"compiled in"
+msgstr ""
+"se ha seleccionado un mecanismo de autenticación SASL, pero el soporte de "
+"SASL no está disponible"
-#: ../src/mn-imap-mailbox.gob:1624
-#: ../src/mn-pop3-mailbox.gob:1100
+#: ../src/mn-imap-mailbox.gob:1624 ../src/mn-pop3-mailbox.gob:1100
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "mecanismo de autenticación desconocido \"%s\""
-#: ../src/mn-imap-mailbox.gob:1656
-#: ../src/mn-pop3-mailbox.gob:1136
+#: ../src/mn-imap-mailbox.gob:1656 ../src/mn-pop3-mailbox.gob:1136
#, c-format
msgid "disabling mechanism \"%s\" and retrying SASL authentication"
-msgstr "deshabilitando el mecanismo \"%s\" y volviendo a probar con la autenticación SASL"
+msgstr ""
+"deshabilitando el mecanismo \"%s\" y volviendo a probar con la autenticación "
+"SASL"
#: ../src/mn-imap-mailbox.gob:1668
msgid "falling back to IMAP LOGIN authentication"
msgstr "pasando a autenticación con IMAP LOGIN"
-#: ../src/mn-imap-mailbox.gob:1724
-#: ../src/mn-pop3-mailbox.gob:744
+#: ../src/mn-imap-mailbox.gob:1724 ../src/mn-pop3-mailbox.gob:744
#, c-format
msgid "cannot retrieve %i message"
msgid_plural "cannot retrieve %i messages"
@@ -873,8 +959,7 @@ msgid "_Consider New Mail as Read"
msgstr "_Considerar correo nuevo como leído"
#. translators: header capitalization
-#: ../src/mn-mail-icon.gob:95
-#: ../src/mn-mailbox-view.gob:312
+#: ../src/mn-mail-icon.gob:95 ../src/mn-mailbox-view.gob:312
msgid "_Update"
msgstr "_Actualizar"
@@ -945,8 +1030,7 @@ msgstr "tipo de buzón \"%s\" desconocido"
msgid "property \"%s\" has no value"
msgstr "la propiedad \"%s\" no tiene valor"
-#: ../src/mn-mailbox.gob:1044
-#: ../src/mn-mailbox.gob:1062
+#: ../src/mn-mailbox.gob:1044 ../src/mn-mailbox.gob:1062
#: ../src/mn-shell.gob:624
#, c-format
msgid "%s: %s"
@@ -995,8 +1079,7 @@ msgstr[1] "Se han producido errores cargando la configuración de los buzones"
msgid "Unable to save the mailboxes configuration"
msgstr "No se puede salvar la configuración de los buzones"
-#: ../src/mn-mailboxes.gob:469
-#: ../src/mn-vfs.c:233
+#: ../src/mn-mailboxes.gob:469 ../src/mn-vfs.c:233
#, c-format
msgid "Unable to remove %s: %s."
msgstr "No se puede suprimir %s: %s."
@@ -1021,17 +1104,14 @@ msgstr "No se puede escribir el documento XML."
msgid "Unable to close %s: %s."
msgstr "No se puede cerrar %s: %s."
-#: ../src/mn-mailboxes.gob:507
-#: ../src/mn-mailboxes.gob:514
-#: ../src/mn-vfs.c:251
+#: ../src/mn-mailboxes.gob:507 ../src/mn-mailboxes.gob:514 ../src/mn-vfs.c:251
#: ../src/mn-vfs.c:259
#, c-format
msgid "Unable to rename %s to %s: %s."
msgstr "No se puede renombrar %s a %s: %s."
#. non fatal
-#: ../src/mn-mailboxes.gob:520
-#: ../src/mn-vfs.c:269
+#: ../src/mn-mailboxes.gob:520 ../src/mn-vfs.c:269
#, c-format
msgid "unable to delete %s: %s"
msgstr "no se puede suprimir %s: %s"
@@ -1064,7 +1144,7 @@ msgid "error while reading folder \"%s\": %s"
msgstr "se ha producido un error leyendo la carpeta \"%s\": %s"
#: ../src/mn-maildir-mailbox-backend.gob:253
-#: ../src/mn-mh-mailbox-backend.gob:200
+#: ../src/mn-mh-mailbox-backend.gob:210
#: ../src/mn-sylpheed-mailbox-backend.gob:311
#, c-format
msgid "cannot read %i message"
@@ -1078,12 +1158,15 @@ msgstr "¿Eliminar mensaje?"
#: ../src/mn-maildir-message.gob:225
msgid "The message cannot be moved to the trash. Permanently delete it?"
-msgstr "El mensaje no se puede mover a la papelera. ¿Eliminarlo permanentemente?"
+msgstr ""
+"El mensaje no se puede mover a la papelera. ¿Eliminarlo permanentemente?"
#: ../src/mn-maildir-message.gob:250
#, c-format
-msgid "The message could not be moved to the trash (%s). Permanently delete it?"
-msgstr "El mensaje no se pudo mover a la papelera (%s). ¿Eliminarlo permanentemente?"
+msgid ""
+"The message could not be moved to the trash (%s). Permanently delete it?"
+msgstr ""
+"El mensaje no se pudo mover a la papelera (%s). ¿Eliminarlo permanentemente?"
#: ../src/mn-main.c:72
msgid "yes"
@@ -1111,12 +1194,16 @@ msgstr "Características de POP3 e IMAP:\n"
#: ../src/mn-main.c:200
#, c-format
msgid "Unable to contact the running Mail Notification instance: %s."
-msgstr "No se puede contactar con la instancia en ejecución de Notificación de correo: %s."
+msgstr ""
+"No se puede contactar con la instancia en ejecución de Notificación de "
+"correo: %s."
#: ../src/mn-main.c:240
#, c-format
msgid "%s option ignored since Mail Notification is not already running"
-msgstr "la opción %s se ignora puesto que Notificación de correo ya no se está ejecutando"
+msgstr ""
+"la opción %s se ignora puesto que Notificación de correo ya no se está "
+"ejecutando"
#: ../src/mn-main.c:334
msgid "Show version information"
@@ -1175,8 +1262,12 @@ msgid "An initialization error has occurred in Mail Notification"
msgstr "Se ha producido un error iniciando Notificación de correo"
#: ../src/mn-main.c:499
-msgid "Unable to initialize the notification library. Message popups will not be displayed."
-msgstr "No se pudo iniciar la biblioteca de notificación. Los mensajes emergentes no se mostrarán."
+msgid ""
+"Unable to initialize the notification library. Message popups will not be "
+"displayed."
+msgstr ""
+"No se pudo iniciar la biblioteca de notificación. Los mensajes emergentes no "
+"se mostrarán."
#: ../src/mn-main.c:544
msgid "quitting Mail Notification"
@@ -1222,8 +1313,7 @@ msgstr "No se puede marcar el mensaje como leído"
msgid "Mark as Spam"
msgstr "Marcar como Spam"
-#: ../src/mn-message.gob:118
-#: ../src/mn-message.gob:128
+#: ../src/mn-message.gob:118 ../src/mn-message.gob:128
msgid "Unable to mark message as spam"
msgstr "No se puede marcar el mensaje como spam"
@@ -1232,21 +1322,18 @@ msgstr "No se puede marcar el mensaje como spam"
msgid "Delete"
msgstr "Suprimir"
-#: ../src/mn-message.gob:336
-#: ../src/mn-sound-player.gob:133
-#: ../src/mn-sound-player.gob:169
-#: ../src/mn-util.c:1577
+#: ../src/mn-message.gob:336 ../src/mn-sound-player.gob:133
+#: ../src/mn-sound-player.gob:169 ../src/mn-util.c:1577
#, c-format
msgid "Unable to execute \"%s\": %s."
msgstr "No se puede ejecutar \"%s\": %s."
-#: ../src/mn-mh-mailbox-backend.gob:209
+#: ../src/mn-mh-mailbox-backend.gob:219
#, c-format
msgid "error while reading %s: %s"
msgstr "error leyendo %s: %s"
-#: ../src/mn-mh-mailbox-backend.gob:223
-#: ../src/mn-webmail-mailbox.gob:276
+#: ../src/mn-mh-mailbox-backend.gob:243 ../src/mn-webmail-mailbox.gob:276
#, c-format
msgid "unable to open %s: %s"
msgstr "no se puede abrir %s: %s"
@@ -1300,13 +1387,20 @@ msgstr "certificado perdido"
#: ../src/mn-pi-mailbox.gob:339
#, c-format
msgid ""
-"Mail Notification was unable to trust \"%s\" (%s). It is possible that someone is intercepting your communication to obtain your confidential information.\n"
+"Mail Notification was unable to trust \"%s\" (%s). It is possible that "
+"someone is intercepting your communication to obtain your confidential "
+"information.\n"
"\n"
-"You should only connect to the server if you are certain you are connected to \"%s\". If you choose to connect to the server, this message will not be shown again."
+"You should only connect to the server if you are certain you are connected "
+"to \"%s\". If you choose to connect to the server, this message will not be "
+"shown again."
msgstr ""
-"Notificación de correo no puede establecer la confianza para \"%s\" (%s). Es posible que alguien esté interceptando la comunicación para obtener información confidencial.\n"
+"Notificación de correo no puede establecer la confianza para \"%s\" (%s). Es "
+"posible que alguien esté interceptando la comunicación para obtener "
+"información confidencial.\n"
"\n"
-"Deberías conectar al sólo al servidor si estás seguro de estar conectando a \"%s\". Si eliges conectar al servidor, este mensaje no volverá a mostrarse."
+"Deberías conectar al sólo al servidor si estás seguro de estar conectando a "
+"\"%s\". Si eliges conectar al servidor, este mensaje no volverá a mostrarse."
#: ../src/mn-pi-mailbox.gob:353
#, c-format
@@ -1328,8 +1422,12 @@ msgstr "argumentos no válidos para la capacidad LOGIN-DELAY"
#. * initial client response.
#.
#: ../src/mn-pop3-mailbox.gob:500
-msgid "SASL authentication with initial client response failed, retrying without initial client response"
-msgstr "La autenticación SASL con respuesta inicial del cliente ha fallado, reintentando sin respuesta inicial de cliente"
+msgid ""
+"SASL authentication with initial client response failed, retrying without "
+"initial client response"
+msgstr ""
+"La autenticación SASL con respuesta inicial del cliente ha fallado, "
+"reintentando sin respuesta inicial de cliente"
#: ../src/mn-pop3-mailbox.gob:920
#, c-format
@@ -1350,18 +1448,15 @@ msgstr "pasando a APOP"
msgid "falling back to USER/PASS authentication"
msgstr "pasando a autenticación con USER/PASS"
-#: ../src/mn-popup.gob:45
-#: ../src/mn-standard-message-view.gob:39
+#: ../src/mn-popup.gob:45 ../src/mn-standard-message-view.gob:39
msgid "Mailbox:"
msgstr "Buzón:"
-#: ../src/mn-popup.gob:46
-#: ../src/mn-standard-message-view.gob:40
+#: ../src/mn-popup.gob:46 ../src/mn-standard-message-view.gob:40
msgid "From:"
msgstr "De:"
-#: ../src/mn-popup.gob:47
-#: ../src/mn-standard-message-view.gob:41
+#: ../src/mn-popup.gob:47 ../src/mn-standard-message-view.gob:41
msgid "Subject:"
msgstr "Asunto:"
@@ -1387,8 +1482,7 @@ msgid "New Message"
msgstr "Nuevo mensaje"
#. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:114
-#: ../ui/properties-dialog.glade.h:18
+#: ../src/mn-properties-dialog.gob:114 ../ui/properties-dialog.glade.h:18
msgid "Mail Notification Properties"
msgstr "Propiedades de Notificación de correo"
@@ -1418,12 +1512,14 @@ msgid "No mail reader is configured"
msgstr "No hay ningún cliente de correo configurado"
#: ../src/mn-shell.gob:431
-msgid "You can configure a mail reader by choosing <b>System → Preferences → Preferred Applications</b>."
-msgstr "Puedes configurar tu cliente de correo utilizando <b>Sistema → Preferencias → Aplicaciones Preferidas</b>."
+msgid ""
+"You can configure a mail reader by choosing <b>System → Preferences → "
+"Preferred Applications</b>."
+msgstr ""
+"Puedes configurar tu cliente de correo utilizando <b>Sistema → Preferencias "
+"→ Aplicaciones Preferidas</b>."
-#: ../src/mn-shell.gob:443
-#: ../src/mn-shell.gob:449
-#: ../src/mn-shell.gob:794
+#: ../src/mn-shell.gob:443 ../src/mn-shell.gob:449 ../src/mn-shell.gob:794
msgid "Unable to open the latest message"
msgstr "No se puede abrir el último mensaje"
@@ -1432,8 +1528,7 @@ msgstr "No se puede abrir el último mensaje"
msgid "Messages of mailbox \"%s\" cannot be opened."
msgstr "Los correos del buzón \"%s\" no se han podido abrir."
-#: ../src/mn-shell.gob:450
-#: ../src/mn-shell.gob:714
+#: ../src/mn-shell.gob:450 ../src/mn-shell.gob:714
msgid "You have no new mail."
msgstr "No hay correo nuevo."
@@ -1480,8 +1575,7 @@ msgstr "Archivos de audio"
msgid "Unable to play sound"
msgstr "No se puede reproducir el sonido"
-#: ../src/mn-sound-player.gob:122
-#: ../src/mn-util.c:1576
+#: ../src/mn-sound-player.gob:122 ../src/mn-util.c:1576
msgid "A command error has occurred in Mail Notification"
msgstr "Se ha producido un error en Notificación de correo"
@@ -1540,8 +1634,12 @@ msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
msgstr "El buzón del sistema es <span weight=\"bold\">%s</span>."
#: ../src/mn-system-vfs-mailbox-properties.gob:80
-msgid "The location of your system mailbox could not be detected. Check the MAIL environment variable."
-msgstr "No se puede detectar la ubicación de la buzón del sistema. Comprueba la variable de entorno MAIL."
+msgid ""
+"The location of your system mailbox could not be detected. Check the MAIL "
+"environment variable."
+msgstr ""
+"No se puede detectar la ubicación de la buzón del sistema. Comprueba la "
+"variable de entorno MAIL."
#: ../src/mn-system-vfs-mailbox.gob:71
msgid "system mailbox not found"
@@ -1561,9 +1659,7 @@ msgstr "Mensaje de prueba #%i"
msgid "Mail Notification Properties Dialog"
msgstr "Diálogo de propiedades de Notificación de correo"
-#: ../src/mn-util.c:525
-#: ../src/mn-util.c:548
-#: ../src/mn-util.c:568
+#: ../src/mn-util.c:525 ../src/mn-util.c:548 ../src/mn-util.c:568
#: ../src/mn-util.c:590
msgid "A drag and drop error has occurred"
msgstr "Se ha producido un error de arrastrar y soltar"
@@ -1745,8 +1841,12 @@ msgstr "fallo desconocido %s"
#: ../src/mn-xml.c:51
#, c-format
-msgid "property \"%s\": unable to transform string \"%s\" into a value of type \"%s\""
-msgstr "propiedad \"%s\": no se puede transformar la cadena \"%s\" a un valor de tipo \"%s\""
+msgid ""
+"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
+"\""
+msgstr ""
+"propiedad \"%s\": no se puede transformar la cadena \"%s\" a un valor de "
+"tipo \"%s\""
#: ../src/mn-yahoo-mailbox.gob:71
#, c-format
@@ -1767,8 +1867,7 @@ msgid "<span weight=\"bold\">Delay Between Mail Checks</span>"
msgstr "<span weight=\"bold\">Retraso entre comprobaciones</span>"
#. translators: header capitalization
-#: ../ui/mailbox-properties-dialog.glade.h:2
-#: ../ui/properties-dialog.glade.h:6
+#: ../ui/mailbox-properties-dialog.glade.h:2 ../ui/properties-dialog.glade.h:6
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">General</span>"
@@ -1837,7 +1936,7 @@ msgstr "Mensajes Emergentes"
#: ../ui/properties-dialog.glade.h:21
msgid "Play a _sound when new mail arrives:"
-msgstr "Reproducir un sonido al recibir correo nuevo:"
+msgstr "_Reproducir un sonido al recibir correo nuevo:"
#. translators: header capitalization
#: ../ui/properties-dialog.glade.h:23
@@ -1874,16 +1973,22 @@ msgstr "_Nunca"
#~ msgid "Mail Notification automation"
#~ msgstr "Automatización de Notificación de correo"
+
#~ msgid "Mail Notification automation factory"
#~ msgstr "Construcción de la automatización de Notificación de correo"
+
#~ msgid "Evolution folder tree control"
#~ msgstr "Control del árbol de carpetas de Evolution"
+
#~ msgid "Evolution folder tree control factory"
#~ msgstr "Construcción del control de árbol de carpetas de Evolution"
+
#~ msgid "Mail Notification / Evolution glue"
#~ msgstr "Notificación de correo / Enlace con Evolution"
+
#~ msgid "Mail Notification / Evolution glue factory"
#~ msgstr "Notificación de correo / Construcción del enlace con Evolution"
+
#~ msgid ""
#~ "If /apps/mail-notification/popups/expiration/enabled is set to \"true\", "
#~ "the amount of time to wait before expiring message popups (seconds part)."
@@ -1891,84 +1996,107 @@ msgstr "_Nunca"
#~ "Si /apps/mail-notification/popups/expiration/enabled está en \"true\", "
#~ "tiempo a esperar antes de terminar los mensajes emergentes (partes de "
#~ "segundo)"
+
#~ msgid "Minutes to wait before expiring message popups"
#~ msgstr "Minutos antes de cerrar los mensajes emergentes"
+
#~ msgid "The currently selected URI"
#~ msgstr "El URI actualmente seleccionado"
+
#~ msgid ""
#~ "Bonobo could not locate the %s server. Please check your Mail "
#~ "Notification installation."
#~ msgstr ""
#~ "Bonobo no puede encontrar el servidor %s. Comprueba tu instalación de "
#~ "Notificación de correo."
+
#~ msgid ""
#~ "Bonobo was unable to register the %s server. Please check your Mail "
#~ "Notification installation."
#~ msgstr ""
#~ "Bonobo no puede registrar el servidor %s. Comprueba tu instalación de "
#~ "Notificación de correo."
+
#~ msgid "unable to fetch message"
#~ msgstr "no se puede recuperar el mensaje"
+
#~ msgid "A Bonobo exception (%s) has occurred in %s()."
#~ msgstr "Se ha producido una excepción de Bonobo (%s) en %s()."
+
#~ msgid ""
#~ "Bonobo could not locate the automation object. Please check your Mail "
#~ "Notification installation."
#~ msgstr ""
#~ "Bonobo no puede encontrar el objeto de automatización. Comprueba la "
#~ "instalación de Notificación de correo."
+
#~ msgid ""
#~ "Bonobo could not locate the %s file. Please check your Mail Notification "
#~ "installation."
#~ msgstr ""
#~ "Bonobo no puede encontrar el fichero %s. Comprueba la instalación de "
#~ "Notificación de correo."
+
#~ msgid "Unknown"
#~ msgstr "Desconocido"
+
#~ msgid "unknown error"
#~ msgstr "error desconocido"
+
#~ msgid "Unable to delete message"
#~ msgstr "No se puede eliminar el mensaje"
+
#~ msgid "file version missing"
#~ msgstr "versión del fichero perdida"
+
#~ msgid ""
#~ "Unable to load image \"%s\" (%s). Please check your Mail Notification "
#~ "installation."
#~ msgstr ""
#~ "No se puede cargar la imagen \"%s\" (%s). Por favor, comprueba la "
#~ "instalación de Notificación de correo."
+
#~ msgid ""
#~ "Unable to load interface \"%s\". Please check your Mail Notification "
#~ "installation."
#~ msgstr ""
#~ "No se puede cargar la interfaz \"%s\". Comprueba la instalación de "
#~ "Notificación de correo."
+
#~ msgid ""
#~ "Widget \"%s\" not found in interface \"%s\". Please check your Mail "
#~ "Notification installation."
#~ msgstr ""
#~ "No se ha encontrado el Widget \"%s\" en la interfaz \"%s\". Comprueba la "
#~ "instalación de Notificación de correo."
+
#~ msgid "Unable to open self as a module (%s)."
#~ msgstr "No se puede abrir como módulo (%s)."
+
#~ msgid ""
#~ "Signal handler \"%s\" not found. Please check your Mail Notification "
#~ "installation."
#~ msgstr ""
#~ "Gestor de señales \"%s\" no encontrado. Por favor, comprueba la "
#~ "instalación de Notificación de correo."
+
#~ msgid "Unable to create a thread: %s."
#~ msgstr "No se puede crear el hilo: %s"
+
#~ msgid "unable to get current time: %s"
#~ msgstr "no se puede recuperar la hora actual: %s"
+
#~ msgid "unknown date"
#~ msgstr "fecha desconocida"
+
#~ msgid "Mailbox _name:"
#~ msgstr "Nombre del _buzón:"
+
#~ msgid "_Delay between mail checks:"
#~ msgstr "_Tiempo entre comprobaciones de correo:"
+
#~ msgid "_Use Default"
#~ msgstr "_Usar Predeterminados"
+
#~ msgid "seconds"
#~ msgstr "segundos"
-
diff --git a/po/fr.po b/po/fr.po
@@ -8,10 +8,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 5.2\n"
+"Project-Id-Version: mail-notification 5.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-28 08:21+0100\n"
-"PO-Revision-Date: 2008-03-20 16:52+0100\n"
+"POT-Creation-Date: 2008-04-27 16:50+0200\n"
+"PO-Revision-Date: 2008-04-27 16:51+0200\n"
"Last-Translator: Jean-Yves Lefort <jylefort@brutele.be>\n"
"Language-Team: Jean-Yves Lefort <jylefort@brutele.be>\n"
"MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgstr "Configurer l'avertisseur de courrier"
#: ../data/mail-notification-properties.desktop.in.h:2
#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:296
-#: ../src/mn-main.c:103 ../src/mn-main.c:424 ../src/mn-main.c:445
-#: ../src/mn-main.c:496
+#: ../src/mn-main.c:107 ../src/mn-main.c:437 ../src/mn-main.c:458
+#: ../src/mn-main.c:509
msgid "Mail Notification"
msgstr "Avertisseur de courrier"
@@ -78,7 +78,9 @@ msgstr "Hauteur de la boîte de dialogue contenant les propriétés"
msgid ""
"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
"number of seconds to wait before expiring message popups."
-msgstr "Si /apps/mail-notification/popups/expiration/enabled est « true », le délai d'expiration des popups, en secondes."
+msgstr ""
+"Si /apps/mail-notification/popups/expiration/enabled est « true », le délai "
+"d'expiration des popups, en secondes."
#: ../data/mail-notification.schemas.in.in.h:12
msgid "Mail changed command"
@@ -163,7 +165,9 @@ msgstr "La commande à exécuter lorsque la liste des messages change."
msgid ""
"The command to use to play a sound file. The string %file will be "
"substituted with the filename of the sound to play."
-msgstr "La commande à utiliser pour lire un fichier son. La chaîne de caractères %file sera remplacée par le nom du fichier son à jouer."
+msgstr ""
+"La commande à utiliser pour lire un fichier son. La chaîne de caractères %"
+"file sera remplacée par le nom du fichier son à jouer."
#: ../data/mail-notification.schemas.in.in.h:32
msgid "The height of the properties dialog in pixels."
@@ -179,10 +183,10 @@ msgid ""
msgstr ""
"La liste des jeux de caractères à essayer lorsque des données 8-bit "
"invalides sont trouvées dans un en-tête de message. Le premier de ces jeux "
-"qui permet de convertir les données 8-bit sera utilisé. Le nom spécial « "
-"user » sera remplacé par le jeu de caractère de l'utilisateur. Veuillez "
-"noter que l'avertisseur de courrier doit être relancé pour que les "
-"changements prennent effet."
+"qui permet de convertir les données 8-bit sera utilisé. Le nom spécial « user "
+"» sera remplacé par le jeu de caractère de l'utilisateur. Veuillez noter que "
+"l'avertisseur de courrier doit être relancé pour que les changements "
+"prennent effet."
#: ../data/mail-notification.schemas.in.in.h:34
msgid ""
@@ -286,8 +290,8 @@ msgid ""
"Whether to expire message popups or not. Must be \"default\", \"false\" or "
"\"true\"."
msgstr ""
-"Si l'expiration des popups doit être activée ou pas. Doit être « default », "
-"« false » ou « true »."
+"Si l'expiration des popups doit être activée ou pas. Doit être « default », « "
+"false » ou « true »."
#: ../data/mail-notification.schemas.in.in.h:51
msgid "Whether to play a sound when new mail arrives or not."
@@ -496,8 +500,8 @@ msgid ""
"user-provided server name \"%s\" does not match certificate-provided server "
"name \"%s\""
msgstr ""
-"le nom de serveur « %s » fourni par l'utilisateur ne correspond pas au nom "
-"de serveur « %s » fourni par le certificat"
+"le nom de serveur « %s » fourni par l'utilisateur ne correspond pas au nom de "
+"serveur « %s » fourni par le certificat"
#: ../src/mn-client-session.c:645
#, c-format
@@ -734,7 +738,9 @@ msgstr "impossible de contacter Evolution"
#: ../src/mn-evolution-plugin.c:151
msgid "A fatal error has occurred in the Evolution Mail Notification plugin"
-msgstr "Une erreur fatale s'est produite dans l'extension Evolution « Avertisseur de courrier »"
+msgstr ""
+"Une erreur fatale s'est produite dans l'extension Evolution « Avertisseur de "
+"courrier »"
#: ../src/mn-evolution-plugin.c:152 ../src/mn-main.c:250
msgid "The connection to the D-Bus session bus was lost."
@@ -745,7 +751,7 @@ msgstr "La connexion à la session D-Bus a été perdue."
msgid "Unable to initialize the Mail Notification plugin"
msgstr "Impossible d'initialiser l'extension « Avertisseur de courrier »"
-#: ../src/mn-evolution-plugin.c:176 ../src/mn-main.c:270
+#: ../src/mn-evolution-plugin.c:176 ../src/mn-main.c:283
#, c-format
msgid "Unable to connect to the D-Bus session bus: %s."
msgstr "Impossible de se connecter au bus session D-Bus : %s."
@@ -753,7 +759,9 @@ msgstr "Impossible de se connecter au bus session D-Bus : %s."
#: ../src/mn-evolution-plugin.c:227
#, c-format
msgid "Unable to register the Mail Notification Evolution D-Bus server: %s."
-msgstr "Impossible d'enregistrer le serveur D-Bus de l'avertisseur de courrier Evolution : %s."
+msgstr ""
+"Impossible d'enregistrer le serveur D-Bus de l'avertisseur de courrier "
+"Evolution : %s."
#: ../src/mn-evolution-server.gob:152
#, c-format
@@ -828,7 +836,7 @@ msgstr "impossible de chercher dans %s : %s"
msgid "unable to tell position of %s: %s"
msgstr "impossible de dire la position de %s : %s"
-#: ../src/mn-gmime-stream-vfs.gob:56 ../src/mn-mh-mailbox-backend.gob:206
+#: ../src/mn-gmime-stream-vfs.gob:56 ../src/mn-mh-mailbox-backend.gob:216
#: ../src/mn-webmail-mailbox.gob:147
#, c-format
msgid "unable to close %s: %s"
@@ -891,8 +899,8 @@ msgid ""
"\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
"logging out"
msgstr ""
-"la valeur de l'option « Utiliser l'extension IDLE » dans les propriétés de "
-"la boîte aux lettres est « jamais », fermeture de session"
+"la valeur de l'option « Utiliser l'extension IDLE » dans les propriétés de la "
+"boîte aux lettres est « jamais », fermeture de session"
#: ../src/mn-imap-mailbox.gob:1074
#, c-format
@@ -979,24 +987,24 @@ msgid "%s Properties"
msgstr "Propriétés de %s"
#. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:208
+#: ../src/mn-mailbox-properties-dialog.gob:210
msgid "Add a Mailbox"
msgstr "Ajouter une boîte aux lettres"
-#: ../src/mn-mailbox-properties-dialog.gob:583
+#: ../src/mn-mailbox-properties-dialog.gob:585
msgid "_Default:"
msgstr "_Valeur par défaut :"
-#: ../src/mn-mailbox-properties-dialog.gob:585
+#: ../src/mn-mailbox-properties-dialog.gob:587
#: ../ui/mailbox-properties-dialog.glade.h:9
msgid "_Default"
msgstr "_Valeur par défaut"
-#: ../src/mn-mailbox-properties-dialog.gob:612
+#: ../src/mn-mailbox-properties-dialog.gob:614
msgid "D_efault:"
msgstr "Valeur par _défaut :"
-#: ../src/mn-mailbox-properties-dialog.gob:616
+#: ../src/mn-mailbox-properties-dialog.gob:618
#: ../ui/mailbox-properties-dialog.glade.h:4
msgid "D_efault"
msgstr "Valeur par _défaut"
@@ -1019,22 +1027,22 @@ msgstr "boîte aux lettres %s"
msgid "detecting mailbox type..."
msgstr "détection du type de boîte aux lettres en cours..."
-#: ../src/mn-mailbox.gob:559
+#: ../src/mn-mailbox.gob:565
#, c-format
msgid "\"type\" attribute missing"
msgstr "attribut « type » manquant"
-#: ../src/mn-mailbox.gob:566
+#: ../src/mn-mailbox.gob:572
#, c-format
msgid "unknown mailbox type \"%s\""
msgstr "type de boîte aux lettres « %s » inconnu"
-#: ../src/mn-mailbox.gob:965
+#: ../src/mn-mailbox.gob:971
#, c-format
msgid "property \"%s\" has no value"
msgstr "la propriété « %s » n'a pas de valeur"
-#: ../src/mn-mailbox.gob:1044 ../src/mn-mailbox.gob:1062
+#: ../src/mn-mailbox.gob:1050 ../src/mn-mailbox.gob:1068
#: ../src/mn-shell.gob:624
#, c-format
msgid "%s: %s"
@@ -1154,7 +1162,7 @@ msgid "error while reading folder \"%s\": %s"
msgstr "erreur lors de la lecture du dossier « %s » : %s"
#: ../src/mn-maildir-mailbox-backend.gob:253
-#: ../src/mn-mh-mailbox-backend.gob:200
+#: ../src/mn-mh-mailbox-backend.gob:210
#: ../src/mn-sylpheed-mailbox-backend.gob:311
#, c-format
msgid "cannot read %i message"
@@ -1180,74 +1188,75 @@ msgstr ""
"Le message n'a pu être déplacé vers la corbeille (%s). Le supprimer de "
"manière permanente ?"
-#: ../src/mn-main.c:72
+#: ../src/mn-main.c:76
msgid "yes"
msgstr "oui"
-#: ../src/mn-main.c:72
+#: ../src/mn-main.c:76
msgid "no"
msgstr "non"
-#: ../src/mn-main.c:103
+#: ../src/mn-main.c:107
#, c-format
msgid "%s version %s\n"
msgstr "%s version %s\n"
-#: ../src/mn-main.c:108
+#: ../src/mn-main.c:112
#, c-format
msgid "Mailbox backends:\n"
msgstr "Prises en charge de boîtes aux lettres :\n"
-#: ../src/mn-main.c:113
+#: ../src/mn-main.c:117
#, c-format
msgid "IMAP and POP3 features:\n"
msgstr "Fonctionnalités IMAP et POP3 :\n"
-#: ../src/mn-main.c:200
+#: ../src/mn-main.c:204
#, c-format
msgid "Unable to contact the running Mail Notification instance: %s."
-msgstr "Impossible de contacter l'avertisseur de courrier en cours d'exécution : %s."
+msgstr ""
+"Impossible de contacter l'avertisseur de courrier en cours d'exécution : %s."
-#: ../src/mn-main.c:240
+#: ../src/mn-main.c:244
#, c-format
msgid "%s option ignored since Mail Notification is not already running"
msgstr ""
"option %s ignorée puisque l'avertisseur de courrier n'est pas déjà en cours "
"d'exécution"
-#: ../src/mn-main.c:334
+#: ../src/mn-main.c:347
msgid "Show version information"
msgstr "Afficher les informations de version"
-#: ../src/mn-main.c:343
+#: ../src/mn-main.c:356
msgid "Enable informational output"
msgstr "Activer la sortie informationnelle"
-#: ../src/mn-main.c:352
+#: ../src/mn-main.c:365
msgid "Display the properties dialog"
msgstr "Afficher la boîte de dialogue contenant les propriétés"
-#: ../src/mn-main.c:361
+#: ../src/mn-main.c:374
msgid "Display the about dialog"
msgstr "Afficher la boîte de dialogue « à propos »"
-#: ../src/mn-main.c:370
+#: ../src/mn-main.c:383
msgid "Consider new mail as read"
msgstr "Considérer le nouveau courrier comme lu"
-#: ../src/mn-main.c:379
+#: ../src/mn-main.c:392
msgid "Update the mail status"
msgstr "Mettre à jour le statut du courrier"
-#: ../src/mn-main.c:388
+#: ../src/mn-main.c:401
msgid "Print a XML mail summary"
msgstr "Afficher un aperçu XML du courrier"
-#: ../src/mn-main.c:397
+#: ../src/mn-main.c:410
msgid "Unset obsolete GConf configuration"
msgstr "Supprimer la configuration GConf obsolète"
-#: ../src/mn-main.c:406
+#: ../src/mn-main.c:419
msgid "Quit Mail Notification"
msgstr "Quitter l'avertisseur de courrier"
@@ -1255,24 +1264,24 @@ msgstr "Quitter l'avertisseur de courrier"
#. * We cannot use mn_fatal_error_dialog() because gtk_init() has
#. * not been called yet.
#.
-#: ../src/mn-main.c:432
+#: ../src/mn-main.c:445
msgid "multi-threading is not available"
msgstr "le multi-threading n'est pas disponible"
-#: ../src/mn-main.c:473
+#: ../src/mn-main.c:486
msgid "Mail Notification is not running"
msgstr "L'avertisseur de courrier n'est pas en cours d'exécution"
-#: ../src/mn-main.c:485
+#: ../src/mn-main.c:498
msgid "Unable to initialize the GnomeVFS library."
msgstr "Impossible d'initialiser la bibliothèque GnomeVFS."
-#: ../src/mn-main.c:498
+#: ../src/mn-main.c:511
msgid "An initialization error has occurred in Mail Notification"
msgstr ""
"Une erreur d'initialisation s'est produite dans l'avertisseur de courrier"
-#: ../src/mn-main.c:499
+#: ../src/mn-main.c:512
msgid ""
"Unable to initialize the notification library. Message popups will not be "
"displayed."
@@ -1280,19 +1289,19 @@ msgstr ""
"Impossible d'initialiser la bibliothèque d'avertissement. Les popups ne "
"seront pas affichés."
-#: ../src/mn-main.c:544
+#: ../src/mn-main.c:557
msgid "quitting Mail Notification"
msgstr "en train de quitter l'avertisseur de courrier"
-#: ../src/mn-main.c:563
+#: ../src/mn-main.c:576
msgid "considering new mail as read"
msgstr "considération du nouveau courrier comme étant lu"
-#: ../src/mn-main.c:568
+#: ../src/mn-main.c:581
msgid "updating the mail status"
msgstr "mise à jour du statut du courrier"
-#: ../src/mn-main.c:585
+#: ../src/mn-main.c:598
msgid "Mail Notification is already running"
msgstr "L'avertisseur de courrier est déjà en cours d'exécution"
@@ -1334,17 +1343,17 @@ msgid "Delete"
msgstr "Supprimer"
#: ../src/mn-message.gob:336 ../src/mn-sound-player.gob:133
-#: ../src/mn-sound-player.gob:169 ../src/mn-util.c:1636
+#: ../src/mn-sound-player.gob:169 ../src/mn-util.c:1577
#, c-format
msgid "Unable to execute \"%s\": %s."
msgstr "Impossible d'exécuter « %s » : %s"
-#: ../src/mn-mh-mailbox-backend.gob:209
+#: ../src/mn-mh-mailbox-backend.gob:219
#, c-format
msgid "error while reading %s: %s"
msgstr "erreur lors de la lecture de %s : %s"
-#: ../src/mn-mh-mailbox-backend.gob:223 ../src/mn-webmail-mailbox.gob:276
+#: ../src/mn-mh-mailbox-backend.gob:243 ../src/mn-webmail-mailbox.gob:276
#, c-format
msgid "unable to open %s: %s"
msgstr "impossible d'ouvrir %s : %s"
@@ -1406,13 +1415,13 @@ msgid ""
"to \"%s\". If you choose to connect to the server, this message will not be "
"shown again."
msgstr ""
-"L'avertisseur de courrier n'a pas été en mesure de faire confiance à « %s "
-"» (%s). Il est possible que quelqu'un soit en train d'intercepter votre "
+"L'avertisseur de courrier n'a pas été en mesure de faire confiance à « %s » (%"
+"s). Il est possible que quelqu'un soit en train d'intercepter votre "
"communication afin d'obtenir vos informations confidentielles.\n"
"\n"
"Vous devriez vous connecter au serveur uniquement si vous êtes certain que "
-"vous êtes connecté à « %s ». Si vous choisissez de vous connecter au "
-"serveur, ce message ne sera plus affiché."
+"vous êtes connecté à « %s ». Si vous choisissez de vous connecter au serveur, "
+"ce message ne sera plus affiché."
#: ../src/mn-pi-mailbox.gob:353
#, c-format
@@ -1512,7 +1521,8 @@ msgstr[1] "%i boîtes aux lettres sélectionnées."
#: ../src/mn-server.gob:136
#, c-format
msgid "Unable to register the Mail Notification D-Bus server: %s."
-msgstr "Impossible d'enregistrer le serveur D-Bus de l'avertisseur de courrier : %s."
+msgstr ""
+"Impossible d'enregistrer le serveur D-Bus de l'avertisseur de courrier : %s."
#: ../src/mn-shell.gob:290
#, c-format
@@ -1587,7 +1597,7 @@ msgstr "Fichiers audio"
msgid "Unable to play sound"
msgstr "Impossible de lire le son"
-#: ../src/mn-sound-player.gob:122 ../src/mn-util.c:1635
+#: ../src/mn-sound-player.gob:122 ../src/mn-util.c:1576
msgid "A command error has occurred in Mail Notification"
msgstr "Une erreur de commande s'est produite dans l'avertisseur de courrier"
@@ -1672,28 +1682,28 @@ msgid "Mail Notification Properties Dialog"
msgstr ""
"Boîte de dialogue contenant les propriétés de l'avertisseur de courrier"
-#: ../src/mn-util.c:539 ../src/mn-util.c:562 ../src/mn-util.c:582
-#: ../src/mn-util.c:604
+#: ../src/mn-util.c:525 ../src/mn-util.c:548 ../src/mn-util.c:568
+#: ../src/mn-util.c:590
msgid "A drag and drop error has occurred"
msgstr "Une erreur de glisser-déposer s'est produite"
-#: ../src/mn-util.c:540
+#: ../src/mn-util.c:526
msgid "An invalid location list has been received."
msgstr "Une liste d'emplacements non valide a été reçue."
-#: ../src/mn-util.c:583
+#: ../src/mn-util.c:569
msgid "An invalid Mozilla location has been received."
msgstr "Un emplacement Mozilla non valide a été reçu."
-#: ../src/mn-util.c:694
+#: ../src/mn-util.c:680
msgid "Unable to display help"
msgstr "Impossible d'afficher l'aide"
-#: ../src/mn-util.c:706
+#: ../src/mn-util.c:692
msgid "Unable to open link"
msgstr "Impossible d'ouvrir le lien"
-#: ../src/mn-util.c:897
+#: ../src/mn-util.c:883
#, c-format
msgid ""
"The following location is invalid:\n"
@@ -1712,81 +1722,81 @@ msgstr[1] ""
"\n"
"%s"
-#: ../src/mn-util.c:913
+#: ../src/mn-util.c:899
msgid "A fatal error has occurred in Mail Notification"
msgstr "Une erreur fatale s'est produite dans l'avertisseur de courrier"
-#: ../src/mn-util.c:993
+#: ../src/mn-util.c:979
#, c-format
msgid "%i second ago"
msgid_plural "%i seconds ago"
msgstr[0] "il y a %i seconde"
msgstr[1] "il y a %i secondes"
-#: ../src/mn-util.c:997
+#: ../src/mn-util.c:983
#, c-format
msgid "about %i minute ago"
msgid_plural "about %i minutes ago"
msgstr[0] "il y a approximativement %i minute"
msgstr[1] "il y a approximativement %i minutes"
-#: ../src/mn-util.c:1002
+#: ../src/mn-util.c:988
#, c-format
msgid "about %i hour ago"
msgid_plural "about %i hours ago"
msgstr[0] "il y a approximativement %i heure"
msgstr[1] "il y a approximativement %i heures"
-#: ../src/mn-util.c:1007
+#: ../src/mn-util.c:993
#, c-format
msgid "about %i day ago"
msgid_plural "about %i days ago"
msgstr[0] "il y a approximativement %i jour"
msgstr[1] "il y a approximativement %i jours"
-#: ../src/mn-util.c:1012
+#: ../src/mn-util.c:998
#, c-format
msgid "about %i week ago"
msgid_plural "about %i weeks ago"
msgstr[0] "il y a approximativement %i semaine"
msgstr[1] "il y a approximativement %i semaines"
-#: ../src/mn-util.c:1030
+#: ../src/mn-util.c:1016
#, c-format
msgid "%i second"
msgid_plural "%i seconds"
msgstr[0] "%i seconde"
msgstr[1] "%i secondes"
-#: ../src/mn-util.c:1034
+#: ../src/mn-util.c:1020
#, c-format
msgid "%i minute"
msgid_plural "%i minutes"
msgstr[0] "%i minute"
msgstr[1] "%i minutes"
-#: ../src/mn-util.c:1039
+#: ../src/mn-util.c:1025
#, c-format
msgid "%i hour"
msgid_plural "%i hours"
msgstr[0] "%i heure"
msgstr[1] "%i heures"
-#: ../src/mn-util.c:1044
+#: ../src/mn-util.c:1030
msgid "1 day"
msgstr "1 jour"
-#: ../src/mn-util.c:1565
+#: ../src/mn-util.c:1506
#, c-format
msgid "unterminated substitution"
msgstr "substitution non terminée"
-#: ../src/mn-util.c:1604
+#: ../src/mn-util.c:1545
#, c-format
msgid "unknown substitution \"%s\""
msgstr "substitution « %s » inconnue"
-#: ../src/mn-util.c:1607
+#: ../src/mn-util.c:1548
#, c-format
msgid "empty substitution"
msgstr "substitution vide"
@@ -1858,8 +1868,8 @@ msgid ""
"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
"\""
msgstr ""
-"propriété « %s » : impossible de transformer la chaîne de caractères « %s » "
-"en une valeur de type « %s »"
+"propriété « %s » : impossible de transformer la chaîne de caractères « %s » en "
+"une valeur de type « %s »"
#: ../src/mn-yahoo-mailbox.gob:71
#, c-format
@@ -2083,8 +2093,8 @@ msgstr "Ja_mais"
#~ "Widget \"%s\" not found in interface \"%s\". Please check your Mail "
#~ "Notification installation."
#~ msgstr ""
-#~ "Elément « %s » non trouvé dans l'interface « %s ». Veuillez vérifier "
-#~ "votre installation de l'avertisseur de courrier."
+#~ "Elément « %s » non trouvé dans l'interface « %s ». Veuillez vérifier votre "
+#~ "installation de l'avertisseur de courrier."
#~ msgid "Unable to open self as a module (%s)."
#~ msgstr "Impossible de s'auto-ouvrir en tant que module (%s)."
diff --git a/po/sr.po b/po/sr.po
@@ -11,10 +11,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 5.2\n"
+"Project-Id-Version: mail-notification 5.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-02-28 10:07+0100\n"
-"PO-Revision-Date: 2008-03-20 16:52+0100\n"
+"PO-Revision-Date: 2008-04-27 16:51+0200\n"
"Last-Translator: Филип Милетић <filmil@gmail.com>\n"
"Language-Team: Serbian (sr) <gnu@prevod.org>\n"
"MIME-Version: 1.0\n"
@@ -844,7 +844,7 @@ msgstr "Користи продужетак IDLE"
#: ../src/mn-imap-mailbox-properties.gob:133
msgid "IMAP connection tab|_Never"
-msgstr "IMAP connection tab|_Никад"
+msgstr "_Никад"
#: ../src/mn-imap-mailbox-properties.gob:134
msgid "A_utodetect"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
@@ -11,10 +11,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 5.2\n"
+"Project-Id-Version: mail-notification 5.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-02-28 10:07+0100\n"
-"PO-Revision-Date: 2008-03-20 16:52+0100\n"
+"PO-Revision-Date: 2008-04-27 16:51+0200\n"
"Last-Translator: Filip Miletić <filmil@gmail.com>\n"
"Language-Team: Serbian (sr) <gnu@prevod.org>\n"
"MIME-Version: 1.0\n"
@@ -1959,7 +1959,7 @@ msgstr "_Osveži podatke o pošti"
#: ../ui/properties-dialog.glade.h:30
msgid "message popups tab|_Never"
-msgstr "message popups tab|_Nikad"
+msgstr "_Nikad"
#~ msgid "Mail Notification automation"
#~ msgstr "Automatska dojava prispeća pošte"
diff --git a/po/sv.po b/po/sv.po
@@ -8,10 +8,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 5.2\n"
+"Project-Id-Version: mail-notification 5.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-02-28 10:07+0100\n"
-"PO-Revision-Date: 2008-03-20 16:52+0100\n"
+"PO-Revision-Date: 2008-04-27 16:51+0200\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
diff --git a/src/mn-evolution-server.gob b/src/mn-evolution-server.gob
@@ -210,7 +210,7 @@ class MN:Evolution:Server
G_TYPE_STRING, camel_message_info_from(info),
/* char *subject */
G_TYPE_STRING, camel_message_info_subject(info),
- 0);
+ (GType) 0);
}
private gboolean
diff --git a/src/mn-hotmail-mailbox.gob b/src/mn-hotmail-mailbox.gob
@@ -173,7 +173,7 @@ class MN:Hotmail:Mailbox from MN:Webmail:Mailbox
{
gunichar c = g_utf8_get_char(p);
- if (c < 128 && (g_ascii_isalnum(c) || g_ascii_isspace(c)))
+ if (c < 128 && (g_ascii_isalnum(c) || g_ascii_isspace(c) || c == '.'))
g_string_append_c(encoded, c);
else
g_string_append_printf(encoded, "&#%i;", (int) c);
diff --git a/src/mn-mailbox.gob b/src/mn-mailbox.gob
@@ -245,13 +245,19 @@ class MN:Mailbox (abstract)
/* all unread (unseen and seen) messages */
private GSList *all_messages destroywith mn_g_object_slist_free;
- /* all_messages, indexed by mid */
- private GHashTable *all_messages_mid_hash_table = {g_hash_table_new(g_str_hash, g_str_equal)} destroywith g_hash_table_destroy;
+ /* all_messages, indexed by mid
+ *
+ * These messages are not necessarily present in all_messages (a
+ * seen or considered as read message might not be added to
+ * all_messages), so the hash table holds a reference to each
+ * message.
+ */
+ private GHashTable *all_messages_mid_hash_table = {g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify) g_object_unref)} destroywith g_hash_table_destroy;
/*
- * These messages are not necessarily the same instances as in
- * all_messages (they might have been marked as read previously), so
- * the hash table holds a reference to each message.
+ * These messages are not necessarily present in all_messages (they
+ * might have been marked as read previously), so the hash table
+ * holds a reference to each message.
*/
private GHashTable *all_messages_considered_as_read = {g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify) g_object_unref)} destroywith g_hash_table_destroy;
@@ -316,7 +322,7 @@ class MN:Mailbox (abstract)
g_hash_table_replace(all_messages_hash_table, message->id, message);
if (message->mid)
- g_hash_table_replace(selfp->all_messages_mid_hash_table, message->mid, message);
+ g_hash_table_replace(selfp->all_messages_mid_hash_table, message->mid, g_object_ref(message));
if ((display_seen_mail || (message->flags & MN_MESSAGE_NEW) != 0)
&& ! g_hash_table_lookup(selfp->all_messages_considered_as_read, message->id))
diff --git a/src/mn-main.c b/src/mn-main.c
@@ -63,6 +63,10 @@ typedef struct
static gboolean arg_enable_info = FALSE;
+static unsigned int bus_disconnected_timeout_id = 0;
+
+static gboolean bus_disconnected_cb (gpointer data) G_GNUC_NORETURN;
+
static void
print_components (const Component *components, int n_components)
{
@@ -240,16 +244,25 @@ report_option_ignored (const char *option_name)
g_message(_("%s option ignored since Mail Notification is not already running"), option_name);
}
+static gboolean
+bus_disconnected_cb (gpointer data)
+{
+ mn_show_fatal_error_dialog(NULL, _("The connection to the D-Bus session bus was lost."));
+}
+
static DBusHandlerResult
session_bus_filter_cb (DBusConnection *conn, DBusMessage *message, void *user_data)
{
if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected"))
{
- GDK_THREADS_ENTER();
-
- mn_show_fatal_error_dialog(NULL, _("The connection to the D-Bus session bus was lost."));
+ /*
+ * If the user is logging out there is no reason to display the
+ * error dialog, so wait a bit, hoping that we will be killed
+ * before the timeout triggers.
+ */
- GDK_THREADS_LEAVE();
+ if (bus_disconnected_timeout_id == 0)
+ bus_disconnected_timeout_id = gdk_threads_add_timeout(5000, bus_disconnected_cb, NULL);
return DBUS_HANDLER_RESULT_HANDLED;
}
diff --git a/src/org-jylefort-mail-notification.eplug.in b/src/org-jylefort-mail-notification.eplug.in
@@ -3,7 +3,7 @@
id="org.jylefort.evolution.mail-notification"
type="shlib"
name="Jean-Yves Lefort's Mail Notification"
- location="@evolution-plugindir@/liborg-jylefort-mail-notification.so">
+ location="@evolution-plugin-dir@/liborg-jylefort-mail-notification.so">
<description>Provides Evolution mailbox support for Mail Notification.</description>
<author name="Jean-Yves Lefort" email="jylefort@brutele.be"/>