[pan2] added error popup for posting to a disabled server (max connections 0)
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] added error popup for posting to a disabled server (max connections 0)
- Date: Sun, 17 Jun 2012 08:01:52 +0000 (UTC)
commit 3f5f75e032780d37ae4105ffdcc89c4294b4f8ea
Author: Heinrich MÃller <henmull src gnome org>
Date: Sun Jun 17 09:52:42 2012 +0200
added error popup for posting to a disabled server (max connections 0)
pan/data-impl/data-impl.cc | 2 +-
pan/gui/post-ui.cc | 27 ++++++++++++++++++++++++---
2 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc
index 1c9264e..e3410e9 100644
--- a/pan/data-impl/data-impl.cc
+++ b/pan/data-impl/data-impl.cc
@@ -169,7 +169,7 @@ DataImpl :: password_decrypt (PasswordData& pw) const
}
else
{
- pw.pw = "";
+ pw.pw = const_cast<gchar*>("");
}
return (pw.pw ? GNOME_KEYRING_RESULT_OK : GNOME_KEYRING_RESULT_DENIED) ;
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 32b6891..b768d2b 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -31,6 +31,7 @@ extern "C" {
#include <gtkspell/gtkspell.h>
#endif
}
+#include <pan/data/data.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
#include <pan/general/log.h>
@@ -833,6 +834,8 @@ PostUI :: add_files ()
void
PostUI :: send_now ()
{
+
+
if (!check_charset())
return;
GMimeMessage * message (new_message_from_ui (POSTING));
@@ -1009,13 +1012,31 @@ PostUI :: maybe_post_message (GMimeMessage * message)
// get the server associated with that profile...
const Quark& server (profile.posting_server);
// if the server's invalid, bitch about it to the user
- if (server.empty() || !_data.get_servers().count(server)) {
+ std::string error_msg;
+ bool error = false;
+ if (server.empty() || !_data.get_servers().count(server))
+ error_msg = _("No posting server is set for this posting profile.\nPlease edit the profile via Edit|Manage Posting Profiles.");
+
+ //invalid connection count, can't post
+ Data::Server* s = _data.find_server(server);
+ if (s && s->max_connections == 0)
+ error_msg = _("The selected posting server is currently disabled. Please choose an appropriate alternative.");
+
+// if (server.empty() || !_data.get_servers().count(server)) {
+// GtkWidget * d = gtk_message_dialog_new (
+// GTK_WINDOW(_root),
+// GTK_DIALOG_DESTROY_WITH_PARENT,
+// GTK_MESSAGE_ERROR,
+// GTK_BUTTONS_CLOSE,
+// _("No posting server is set for this posting profile.\nPlease edit the profile via Edit|Manage Posting Profiles."));
+
+ if (!error_msg.empty())
+ {
GtkWidget * d = gtk_message_dialog_new (
GTK_WINDOW(_root),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE,
- _("No posting server is set for this posting profile.\nPlease edit the profile via Edit|Manage Posting Profiles."));
+ GTK_BUTTONS_CLOSE, "%s", error_msg.c_str());
gtk_dialog_run (GTK_DIALOG(d));
gtk_widget_destroy (d);
return false;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]