Merge lp:~roignac/gwibber/Bug614742-facebook-auth-error into lp:gwibber

[Vadim Rutkovsky]

This fix shows error message when authorized in Facebook. Also, had to modify generic error message and translation templates.

[Robert Bruce Park (robru)]

Thanks for taking the time to submit this patch, unfortunately Gwibber has gone through extensive changes recently and your patch no longer applies to the latest codebase.

Fortunately, the bug you were attempting to fix is no longer present in the current codebase. Authentication is now handled by Ubuntu Online Accounts, and there are not currently any known issues with Facebook.

Please try out the latest Gwibber, I think you'll be quite pleased with what we've accomplished.

review: Disapprove

Unmerged revisions

869. By Vadim Rutkovsky on 2010-09-27

Facebook authorization page now shows the error message

=== modified file 'gwibber/lib/gtk/facebook.py'
--- gwibber/lib/gtk/facebook.py	2010-09-15 07:50:53 +0000
+++ gwibber/lib/gtk/facebook.py	2010-09-27 21:14:03 +0000
@@ -26,7 +26,7 @@
 from gtk import Builder
 import gwibber.microblog
 from gwibber.microblog import facebook
-from gwibber.microblog.util import facelib
+from gwibber.microblog.util import facelib, exceptions
 from gwibber.microblog.util.const import *
 # Try to import * from custom, install custom.py to include packaging 
 # customizations like distro API keys, etc
@@ -156,13 +156,14 @@
           self.dialog.get_object("vbox_save").show()
         elif self.dialog:
           self.dialog.get_object("vbox_create").show()
-      except:
-        #FIXME: We should do this in the same window
-        pass
-      web.hide()
-      self.window.resize(self.win_w, self.win_h)
-      self.ui.get_object("vbox1").show()
-      self.ui.get_object("expander1").show()
+        self.ui.get_object("vbox1").show()
+        self.ui.get_object("expander1").show()
+      except gwibber.microblog.util.facelib.FacebookError as e:
+        #FIXME: another error should be used
+        raise exceptions.GwibberServiceError("authentication", service = "Facebook", message = str(e))
+      finally:
+        web.hide()
+        self.window.resize(self.win_w, self.win_h)
 
     if title.get_title() == "Failure":
       gtk.gdk.threads_enter()
 
=== modified file 'gwibber/microblog/util/exceptions.py'
--- gwibber/microblog/util/exceptions.py	2010-09-09 23:05:31 +0000
+++ gwibber/microblog/util/exceptions.py	2010-09-27 21:14:03 +0000
@@ -33,10 +33,9 @@
         else:
             log.logger.error("%s failure: %s:%s - %s", kind, service, username, message)
 
-        display_message = _("There was an %(kind)s failure from %(service)s for account %(account)s, error was %(error)s") % {
+        display_message = _("There was an %(kind)s failure from %(service)s, error was %(error)s") % {
           "kind": kind, 
           "service": service, 
-          "account": username,
           "error": message
         }
         title = _("Gwibber")
 
=== modified file 'po/gwibber.pot'
--- po/gwibber.pot	2010-09-15 07:50:53 +0000
+++ po/gwibber.pot	2010-09-27 21:14:03 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-15 03:49-0400\n"
+"POT-Creation-Date: 2010-09-28 00:09+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../gwibber.desktop.in.h:1 ../gwibber/microblog/util/exceptions.py:42
+#: ../gwibber.desktop.in.h:1 ../gwibber/microblog/util/exceptions.py:41
 msgid "Gwibber"
 msgstr ""
 
@@ -240,32 +240,30 @@
 msgid "%s has been authorized by Facebook"
 msgstr ""
 
-#: ../gwibber/lib/gtk/facebook.py:170
+#: ../gwibber/lib/gtk/facebook.py:171
 msgid "Facebook authorization failed. Please try again."
 msgstr ""
 
 #: ../gwibber/microblog/util/exceptions.py:36
 #, python-format
-msgid ""
-"There was an %(kind)s failure from %(service)s for account %(account)s, "
-"error was %(error)s"
+msgid "There was an %(kind)s failure from %(service)s, error was %(error)s"
 msgstr ""
 
-#: ../gwibber/microblog/util/exceptions.py:45
+#: ../gwibber/microblog/util/exceptions.py:44
 #, python-format
 msgid "Authentication error from %(service)s for account %(account)s"
 msgstr ""
 
-#: ../gwibber/microblog/util/exceptions.py:49
+#: ../gwibber/microblog/util/exceptions.py:48
 msgid "Gwibber Authentication Error"
 msgstr ""
 
+#: ../gwibber/microblog/util/exceptions.py:51
+#, python-format
+msgid "There was a network error communicating with %(message)s"
+msgstr ""
+
 #: ../gwibber/microblog/util/exceptions.py:52
-#, python-format
-msgid "There was a network error communicating with %(message)s"
-msgstr ""
-
-#: ../gwibber/microblog/util/exceptions.py:53
 msgid "Gwibber Network Error"
 msgstr ""