Merge lp:~seb128/software-center/dont_use_gwibber into lp:software-center

[Sebastien Bacher]

clean out gwibber reviews code, that service is deprecated

clean out gwibber reviews code, that service is deprecated

[dobey (dobey)]

review: Approve

=== modified file 'README'
--- README	2012-05-22 12:13:02 +0000
+++ README	2015-09-30 15:59:57 +0000
@@ -47,7 +47,6 @@
 SOFTWARE_CENTER_DEBUG_WEBKIT - enable webkit debuging
 SOFTWARE_CENTER_IPSUM_REVIEWS - generate random reviews
 SOFTWARE_CENTER_FAKE_REVIEW_API - use a fake server for all review network operations
-SOFTWARE_CENTER_GWIBBER_MOCK_USERS=2 - use mock gwibber service
 SOFTWARE_CENTER_AGENT_INCLUDE_QA - show not yet QA apps available from the agent
 SOFTWARE_CENTER_NET_DISCONNECTED - make software-center's netstatus module believe network manager is in a disconnected state
 SOFTWARE_CENTER_WEBLIVE_HOST - overwrite default weblive server

=== modified file 'data/ui/gtk3/dialogs.ui'
--- data/ui/gtk3/dialogs.ui	2012-11-21 15:17:13 +0000
+++ data/ui/gtk3/dialogs.ui	2015-09-30 15:59:57 +0000
@@ -423,74 +423,6 @@
       <action-widget response="-3">button_dependency_do</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkMessageDialog" id="dialog_gwibber_error">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">normal</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="message_type">error</property>
-    <property name="text" translatable="yes">There was a problem posting this review to %s</property>
-    <property name="secondary_text" translatable="yes">%s had not responded within 30 seconds.</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="gwib_err_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="gwib_err_retry_button">
-                <property name="label" translatable="yes">Retry</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-2">gwib_err_cancel_button</action-widget>
-      <action-widget response="-3">gwib_err_retry_button</action-widget>
-    </action-widgets>
-  </object>
   <object class="GtkDialog" id="dialog_install_error">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>

=== modified file 'data/ui/gtk3/submit_review.ui'
--- data/ui/gtk3/submit_review.ui	2011-10-02 02:45:50 +0000
+++ data/ui/gtk3/submit_review.ui	2015-09-30 15:59:57 +0000
@@ -362,36 +362,6 @@
                     <property name="position">6</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkHBox" id="gwibber_hbox">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkCheckButton" id="gwibber_checkbutton">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">7</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">1</property>

=== modified file 'softwarecenter/config.py'
--- softwarecenter/config.py	2013-07-09 14:33:47 +0000
+++ softwarecenter/config.py	2015-09-30 15:59:57 +0000
@@ -141,20 +141,6 @@
             "username", value, section="reviews"),
         None,
         "The sso username")
-    reviews_post_via_gwibber = property(
-        lambda self: self._generic_getbool(
-            "gwibber_send", section="reviews", default=False),
-        lambda self, value: self._generic_setbool(
-            "gwibber_send", value, section="reviews"),
-        None,
-        "Also post reviews via gwibber")
-    reviews_gwibber_account_id = property(
-        lambda self: self._generic_get(
-            "account_id", section="reviews", default=""),
-        lambda self, value: self._generic_setbool(
-            "account_id", value, section="reviews"),
-        None,
-        "The account id to use when sending via gwibber")
 
     # app_window_size is special as its a tuple
     def _app_window_size_get(self):

=== removed file 'softwarecenter/gwibber_helper.py'
--- softwarecenter/gwibber_helper.py	2012-11-28 16:58:59 +0000
+++ softwarecenter/gwibber_helper.py	1970-01-01 00:00:00 +0000
@@ -1,147 +0,0 @@
-# Copyright (C) 2010 Matthew McGowan
-#
-# Authors:
-#  Matthew McGowan
-#  Michael Vogt
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-import dbus
-import logging
-from xdg import BaseDirectory as xdg
-import os.path
-import json
-import sys
-from random import random
-
-
-class GwibberHelper(object):
-    """ A helper class for gwibber. ideally we would just use
-        from gi.repository import Gwibber
-        accounts = Gwibbers.Accounts()
-        accounts.list()
-        ...
-        instead of the dbus iface, but the gi stuff fails
-        to export "Accounts.list()" (and possible more) currently
-    """
-
-    def accounts(self):
-        """ returns accounts that are send_enabled """
-        accounts = []
-        try:
-            bus = dbus.SessionBus()
-            proxy_obj = bus.get_object("com.Gwibber.Accounts",
-                                       "/com/gwibber/Accounts")
-            accounts_iface = dbus.Interface(proxy_obj, "com.Gwibber.Accounts")
-            for account in json.loads(accounts_iface.List()):
-                if 'send_enabled' in account and account["send_enabled"]:
-                    accounts.append(account)
-            return accounts
-        except:
-            logging.exception("GwibberHelper.accounts() failed")
-            return accounts
-
-    def send_message(self, message, account_id=None):
-        """ send message to all accounts with send_enabled """
-        bus = dbus.SessionBus()
-        proxy_obj = bus.get_object("com.Gwibber.Service",
-                                   "/com/gwibber/Service")
-        service_iface = dbus.Interface(proxy_obj, "com.Gwibber.Service")
-        if account_id:
-            json_str = json.dumps({'message': message,
-                                   'accounts': [account_id],
-                                   })
-            service_iface.Send(json_str)
-        else:
-            service_iface.SendMessage(message)
-        return True
-
-    @staticmethod
-    def has_accounts_in_sqlite():
-        """ return if there are accounts for gwibber in sqlite """
-        # don't use dbus, triggers a gwibber start each time we call this
-        dbpath = "%s/gwibber/gwibber.sqlite" % xdg.xdg_config_home
-        if not os.path.exists(dbpath):
-            return False
-        try:
-            import sqlite3
-            with sqlite3.connect(dbpath) as db:
-                results = db.execute("SELECT data FROM accounts")
-                if len(results.fetchall()) > 0:
-                    return True
-            return False
-        except:
-            logging.exception("GwibberHelper.has_accounts_in_sqlite() failed")
-            return False
-
-
-class GwibberHelperMock(object):
-
-    fake_gwibber_accounts_one = [
-        {u'username': u'randomuser',
-         u'user_id': u'2323434224',
-         u'service': u'twitter',
-         u'secret_token': u':some-token',
-         u'color': u'#729FCF',
-         u'receive_enabled': True,
-         u'access_token': u'some_access_token',
-         u'send_enabled': True,
-         u'id': u'twitter-id-random-15af8bddb6',
-         }]
-    fake_gwibber_accounts_multiple = [
-        {u'username': u'random1 with a very long name',
-         u'user_id': u'2342342313',
-         u'service': u'twitter',
-         u'secret_token': u':some-token',
-         u'color': u'#729FCF',
-         u'receive_enabled': True,
-         u'access_token': u'some_access_token',
-         u'send_enabled': True,
-         u'id': u'twitter-id-rnadomuser-radfsdf'},
-        {u'username': u'mpt',
-         u'user_id': u'23safdsaf5',
-         u'service': u'twitter',
-         u'secret_token': u':some_otken',
-         u'color': u'#729FCF',
-         u'receive_enabled': True,
-         u'access_token': u'some_access_token',
-         u'send_enabled': True,
-         u'id': u'twitter-id-mpt-afsdfsa'}]
-
-    def accounts(self):
-        import copy
-        num = os.environ["SOFTWARE_CENTER_GWIBBER_MOCK_USERS"]
-        if int(num) == 0:
-            return []
-        elif int(num) == 1:
-            return copy.copy(self.fake_gwibber_accounts_one)
-        else:
-            return copy.copy(self.fake_gwibber_accounts_multiple)
-
-    def send_message(self, message, account_id="all"):
-        sys.stderr.write("sending '%s' to '%s'\n" % (message, account_id))
-        # used for testing purposes, to emulate a gwibber failure for ~1 out
-        # of every 5 attempts
-        r = random()
-        if (r < 0.2 and
-                not "SOFTWARE_CENTER_GWIBBER_MOCK_NO_FAIL" in os.environ):
-            return False
-        return True
-
-    def has_accounts_in_sqlite():
-        return True
-
-
-GWIBBER_SERVICE_AVAILABLE = (GwibberHelper.has_accounts_in_sqlite() and
-                             os.path.exists("/usr/bin/gwibber-poster"))

=== modified file 'softwarecenter/ui/gtk3/review_gui_helper.py'
--- softwarecenter/ui/gtk3/review_gui_helper.py	2012-12-14 16:44:25 +0000
+++ softwarecenter/ui/gtk3/review_gui_helper.py	2015-09-30 15:59:57 +0000
@@ -54,7 +54,6 @@
 from softwarecenter.backend.login import get_login_backend
 from softwarecenter.backend.reviews import Review
 from softwarecenter.db.database import Application
-from softwarecenter.gwibber_helper import GwibberHelper, GwibberHelperMock
 from softwarecenter.i18n import get_language
 from softwarecenter.ui.gtk3.SimpleGtkbuilderApp import SimpleGtkbuilderApp
 from softwarecenter.ui.gtk3.dialogs import SimpleGtkbuilderDialog
@@ -657,23 +656,6 @@
         self.star_rating.connect('changed', self._on_mandatory_fields_changed)
         self.review_buffer.connect('changed', self._on_text_entry_changed)
 
-        # gwibber stuff
-        self.gwibber_combo = Gtk.ComboBoxText.new()
-        #cells = self.gwibber_combo.get_cells()
-        #cells[0].set_property("ellipsize", pango.ELLIPSIZE_END)
-        self.gwibber_hbox.pack_start(self.gwibber_combo, True, True, 0)
-        if "SOFTWARE_CENTER_GWIBBER_MOCK_USERS" in os.environ:
-            self.gwibber_helper = GwibberHelperMock()
-        else:
-            self.gwibber_helper = GwibberHelper()
-
-        # get a dict with a saved gwibber_send (boolean) and gwibber
-        # account_id for persistent state
-        self.gwibber_prefs = self._get_gwibber_prefs()
-
-        # gwibber stuff
-        self._setup_gwibber_gui()
-
         #now setup rest of app based on whether submit or modify
         if self.action == "submit":
             self._init_submit()
@@ -911,81 +893,6 @@
                             self.iconname, self.version, display_name)
         self.textview_review.grab_focus()
 
-    def _setup_gwibber_gui(self):
-        self.gwibber_accounts = self.gwibber_helper.accounts()
-        list_length = len(self.gwibber_accounts)
-        if list_length == 0:
-            self._on_no_gwibber_accounts()
-        elif list_length == 1:
-            self._on_one_gwibber_account()
-        else:
-            self._on_multiple_gwibber_accounts()
-
-    def _get_gwibber_prefs(self):
-        send = self.config.reviews_post_via_gwibber
-        account_id = self.config.reviews_gwibber_account_id
-
-        return {
-            "gwibber_send": send,
-            "account_id": account_id
-        }
-
-    def _on_no_gwibber_accounts(self):
-        self.gwibber_hbox.hide()
-        self.gwibber_checkbutton.set_active(False)
-
-    def _on_one_gwibber_account(self):
-        account = self.gwibber_accounts[0]
-        self.gwibber_hbox.show()
-        self.gwibber_combo.hide()
-        from softwarecenter.utils import utf8
-        acct_text = utf8(_("Also post this review to %s (@%s)")) % (
-            utf8(account['service'].capitalize()), utf8(account['username']))
-        self.gwibber_checkbutton.set_label(acct_text)
-        # simplifies on_transmit_successful later
-        self.gwibber_combo.append_text(acct_text)
-        self.gwibber_combo.set_active(0)
-        # auto select submit via gwibber checkbutton if saved prefs say True
-        self.gwibber_checkbutton.set_active(self.gwibber_prefs['gwibber_send'])
-
-    def _on_multiple_gwibber_accounts(self):
-        self.gwibber_hbox.show()
-        self.gwibber_combo.show()
-
-        # setup accounts combo
-        self.gwibber_checkbutton.set_label(_("Also post this review to: "))
-        for account in self.gwibber_accounts:
-            acct_text = "%s (@%s)" % (
-                account['service'].capitalize(), account['username'])
-            self.gwibber_combo.append_text(acct_text)
-
-        # add "all" to both combo and accounts (the later is only pseudo)
-        self.gwibber_combo.append_text(_("All my Gwibber services"))
-        self.gwibber_accounts.append({"id": "pseudo-sc-all"})
-
-        # reapply preferences
-        self.gwibber_checkbutton.set_active(self.gwibber_prefs['gwibber_send'])
-        gwibber_active_account = 0
-        for account in self.gwibber_accounts:
-            if account['id'] == self.gwibber_prefs['account_id']:
-                gwibber_active_account = self.gwibber_accounts.index(account)
-        self.gwibber_combo.set_active(gwibber_active_account)
-
-    def _post_to_one_gwibber_account(self, msg, account):
-        """ little helper to facilitate posting message to twitter account
-            passed in
-        """
-        status_text = _("Posting to %s") % utf8(
-            account['service'].capitalize())
-        self._change_status("progress", status_text)
-        return self.gwibber_helper.send_message(msg, account['id'])
-
-    def on_transmit_success(self, api, trans):
-        """on successful submission of a review, try to send to gwibber as
-           well
-        """
-        self._run_gwibber_submits(api, trans)
-
     def _on_key_press_event(self, widget, event):
         if event.keyval == Gdk.KEY_Escape:
             self._confirm_cancellation()
@@ -1018,161 +925,6 @@
             self.submit_window.destroy()
             self.quit()
 
-    def _get_send_accounts(self, sel_index):
-        """return the account referenced by the passed in index, or all
-           accounts if the index of the combo points to the pseudo-sc-all
-           string
-        """
-        if self.gwibber_accounts[sel_index]["id"] == "pseudo-sc-all":
-            return self.gwibber_accounts
-        else:
-            return [self.gwibber_accounts[sel_index]]
-
-    def _submit_to_gwibber(self, msg, send_accounts):
-        """for each send_account passed in, try to submit to gwibber
-            then return a list of accounts that failed to submit (empty list
-            if all succeeded)
-        """
-        #list of gwibber accounts that failed to submit, used later to allow
-        # selective re-send if user desires
-        failed_accounts = []
-        for account in send_accounts:
-            if account["id"] != "pseudo-sc-all":
-                if not self._post_to_one_gwibber_account(msg, account):
-                    failed_accounts.append(account)
-        return failed_accounts
-
-    def _run_gwibber_submits(self, api, trans):
-        """check if gwibber send should occur and send via gwibber if so"""
-        gwibber_success = True
-        using_gwibber = self.gwibber_checkbutton.get_active()
-        if using_gwibber:
-            i = self.gwibber_combo.get_active()
-            msg = (self._gwibber_message())
-            send_accounts = self._get_send_accounts(i)
-            self._save_gwibber_state(True, self.gwibber_accounts[i]['id'])
-            #tries to send to gwibber, and gets back any failed accounts
-            failed_accounts = self._submit_to_gwibber(msg, send_accounts)
-            if len(failed_accounts) > 0:
-                gwibber_success = False
-                #FIXME: send an error string to this method instead of empty
-                # string
-                self._on_gwibber_fail(api, trans, failed_accounts, "")
-        else:
-            # prevent _save_gwibber_state from overwriting the account id
-            # in config if the checkbutton was not selected
-            self._save_gwibber_state(False, None)
-        # run parent handler on gwibber success, otherwise this will be dealt
-        # with in _on_gwibber_fail
-        if gwibber_success:
-            self._success_status()
-            BaseApp.on_transmit_success(self, api, trans)
-
-    def _gwibber_retry_some(self, api, trans, accounts):
-        """ perform selective retrying of gwibber posting, using only
-            accounts passed in
-        """
-        gwibber_success = True
-        failed_accounts = []
-        msg = (self._gwibber_message())
-
-        for account in accounts:
-            if not self._post_to_one_gwibber_account(msg, account):
-                failed_accounts.append(account)
-                gwibber_success = False
-
-        if not gwibber_success:
-            #FIXME: send an error string to this method instead of empty string
-            self._on_gwibber_fail(api, trans, failed_accounts, "")
-        else:
-            self._success_status()
-            BaseApp.on_transmit_success(self, api, trans)
-
-    def _success_status(self):
-        """Updates status area to show success for 2 seconds then allows
-        window to proceed
-        """
-        self._change_status("success", _(self.SUCCESS_MESSAGE))
-        while Gtk.events_pending():
-            Gtk.main_iteration()
-        time.sleep(2)
-
-    def _on_gwibber_fail(self, api, trans, failed_accounts, error):
-        self._change_status("fail", _("Problems posting to Gwibber"))
-        #list to hold service strings in the format: "Service (@username)"
-        failed_services = []
-        for account in failed_accounts:
-            failed_services.append("%s (@%s)" % (
-                account['service'].capitalize(), account['username']))
-
-        glade_dialog = SimpleGtkbuilderDialog(self.datadir,
-            domain="software-center")
-        dialog = glade_dialog.dialog_gwibber_error
-        dialog.set_transient_for(self.submit_window)
-        # build the failure string
-        # TRANSLATORS: the part in %s can either be a single entry
-        #              like "facebook" or a string like
-        #              "factbook and twister"
-        error_str = gettext.ngettext(
-            "There was a problem posting this review to %s.",
-            "There was a problem posting this review to %s.",
-            len(failed_services))
-        error_str = make_string_from_list(error_str, failed_services)
-        dialog.set_markup(error_str)
-        dialog.format_secondary_text(error)
-        result = dialog.run()
-        dialog.destroy()
-        if result == Gtk.RESPONSE_ACCEPT:
-            self._gwibber_retry_some(api, trans, failed_accounts)
-        else:
-            BaseApp.on_transmit_success(self, api, trans)
-
-    def _save_gwibber_state(self, gwibber_send, account_id):
-        self.config.reviews_post_via_gwibber = gwibber_send
-        if account_id:
-            self.config.reviews_gwibber_account_id = account_id
-        self.config.write()
-
-    def _gwibber_message(self, max_len=140):
-        """ build a gwibber message of max_len"""
-        def _gwibber_message_string_from_data(appname, rating, summary, link):
-            """ helper so that we do not duplicate the "reviewed..." string """
-            return _("reviewed %(appname)s in Ubuntu: %(rating)s "
-                       "%(summary)s %(link)s") % {'appname': appname,
-                                                  'rating': rating,
-                                                  'summary': summary,
-                                                  'link': link}
-
-        rating = self.star_rating.get_rating()
-        rating_string = ''
-
-        #fill star ratings for string
-        for i in range(1, 6):
-            if i <= rating:
-                rating_string = rating_string + u"\u2605"
-            else:
-                rating_string = rating_string + u"\u2606"
-
-        review_summary_text = self.review_summary_entry.get_text()
-        # FIXME: currently the link is not useful (at all) for most
-        #        people not running ubuntu
-        #app_link = "http://apt.ubuntu.com/p/%s" % self.app.pkgname
-        app_link = ""
-        gwib_msg = _gwibber_message_string_from_data(
-            self.app.name, rating_string, review_summary_text, app_link)
-
-        #check char count and ellipsize review summary if larger than 140 chars
-        if len(gwib_msg) > max_len:
-            chars_to_reduce = len(gwib_msg) - (max_len - 1)
-            new_char_count = len(review_summary_text) - chars_to_reduce
-            review_summary_text = (review_summary_text[:new_char_count] +
-                u"\u2026")
-            gwib_msg = _gwibber_message_string_from_data(
-                self.app.name, rating_string, review_summary_text, app_link)
-
-        return gwib_msg
-
-
 class ReportReviewApp(BaseApp):
     """ report a given application or package """
 

=== removed file 'tests/test_gwibber.py'
--- tests/test_gwibber.py	2012-05-30 21:52:08 +0000
+++ tests/test_gwibber.py	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-import os
-import unittest
-
-Gwibber = None
-try:
-    from gi.repository import Gwibber
-except ImportError:
-    pass
-
-from tests.utils import (
-    setup_test_env,
-)
-setup_test_env()
-from softwarecenter.gwibber_helper import GwibberHelper, GwibberHelperMock
-
-NOT_DEFINED = object()
-
-
[e-mail](Gwibber is None,
-    "Please install the gwibber gir bindings to run this test case.")
-class TestGwibber(unittest.TestCase):
-    """Tests the "where is it in the menu" code."""
-
-    patch_vars = (("SOFTWARE_CENTER_GWIBBER_MOCK_USERS", "2"),
-                  ("SOFTWARE_CENTER_GWIBBER_MOCK_NO_FAIL", "1"))
-
-    def setUp(self):
-        for env_var, value in self.patch_vars:
-            real = os.environ.get(env_var, NOT_DEFINED)
-            if real is NOT_DEFINED:
-                self.addCleanup(os.environ.pop, env_var)
-            else:
-                self.addCleanup(os.environ.__setitem__, env_var, real)
-            os.environ[env_var] = value
-
-    def test_gwibber_helper_mock(self):
-        gh = GwibberHelperMock()
-        accounts = gh.accounts()
-        self.assertEqual(len(accounts), 2)
-        #print accounts
-        # we can not test the real gwibber here, otherwise it will
-        # post our test data to real services
-        self.assertEqual(gh.send_message ("test"), True)
-
-    def test_gwibber_helper(self):
-        # readonly test as there maybe be real accounts
-        gh = GwibberHelper()
-        have_accounts = gh.has_accounts_in_sqlite()
-        self.assertTrue(isinstance(have_accounts, bool))
-        accounts = gh.accounts()
-        self.assertTrue(isinstance(accounts, list))
-
-    @unittest.skip('not_working_because_gi_does_not_provide_list_test_gwibber')
-    def test_gwibber_send_message(self):
-        service = Gwibber.Service()
-        self.addCleanup(service.quit)
-        # get account data
-        accounts = Gwibber.Accounts()
-        # print dir(accounts)
-        self.assertTrue(len(accounts.list()) > 0)
-        # check single account for send enabled, only do if "True"
-        #print accounts.send_enabled(accounts.list[0])
-        # first check gwibber available
-        service = Gwibber.Service()
-        # print dir(service)
-        service.service_available(False)
-        service.send_message("test")
-
-
-if __name__ == "__main__":
-    unittest.main()

=== modified file 'tests/test_reinstall_purchased.py'
--- tests/test_reinstall_purchased.py	2012-12-17 09:01:00 +0000
+++ tests/test_reinstall_purchased.py	2015-09-30 15:59:57 +0000
@@ -104,7 +104,7 @@
     "package_name": "photobomb",
     "video_embedded_html_urls": [ ],
     "demo": null,
-    "keywords": "photos, pictures, editing, gwibber, twitter, facebook, drawing",
+    "keywords": "photos, pictures, editing, twitter, facebook, drawing",
     "video_urls": [ ],
     "screenshot_url": "http://software-center.ubuntu.com/site_media/screenshots/2011/08/Screenshot-45.png",
     "id": 83,