Hello community, here is the log from the commit of package gwibber for openSUSE:Factory checked in at Mon May 2 16:41:23 CEST 2011.
-------- --- GNOME/gwibber/gwibber.changes 2011-04-07 17:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/gwibber/gwibber.changes 2011-04-26 15:27:00.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 26 14:21:30 BST 2011 - [email protected] + +- Update to version 3.0.0.1: + + Use a dynamic quick list so we don't display a Quit menu in + the launcher when gwibber isn't running + + Don't allow insane refresh intervals, minimum allowed is 5m + + Added option contents arg to GwibberPosterVBox, so consumers + of the API won't need to override the expose event to insert + default contents (LP: #739923) +- Added gwibber-3.1.0-nm09.diff: + + Work with NetworkManager 0.9. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gwibber-3.0.0.tar.bz2 New: ---- gwibber-3.0.0.1.tar.bz2 gwibber-3.1.0-nm09.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwibber.spec ++++++ --- /var/tmp/diff_new_pack.vleMX7/_old 2011-05-02 16:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.vleMX7/_new 2011-05-02 16:40:39.000000000 +0200 @@ -19,7 +19,7 @@ Name: gwibber -Version: 3.0.0 +Version: 3.0.0.1 Release: 1 License: GPLv2+ Summary: Microblogging Client @@ -30,6 +30,8 @@ Patch0: gwibber-stnx.diff # PATCH-FIX-OPENSUSE gwibber-sqlite-migrate-opensuse.diff [email protected] -- Fix migration from 11.3's gwibber Patch3: gwibber-sqlite-migrate-opensuse.diff +# PATCH-FIX-OPENSUSE gwibber-3.1.0-nm09.diff [email protected] -- Work correctly with NetworkManager 0.9 +Patch4: gwibber-3.1.0-nm09.diff BuildRequires: fdupes BuildRequires: intltool BuildRequires: python @@ -68,6 +70,7 @@ %setup -q %patch0 -p1 %patch3 -p1 +%patch4 -p1 %build python setup.py build ++++++ gwibber-3.0.0.tar.bz2 -> gwibber-3.0.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/MANIFEST new/gwibber-3.0.0.1/MANIFEST --- old/gwibber-3.0.0/MANIFEST 1970-01-01 01:00:00.000000000 +0100 +++ new/gwibber-3.0.0.1/MANIFEST 2011-04-08 08:02:04.000000000 +0200 @@ -0,0 +1,393 @@ +# file GENERATED by distutils, do NOT edit +AUTHORS +COPYING +INSTALL +MANIFEST +MANIFEST.in +README +com.Gwibber.Accounts.service +com.Gwibber.Connection.service +com.Gwibber.Searches.service +com.Gwibber.Service.service +com.Gwibber.Streams.service +com.Gwibber.URLShorten.service +com.GwibberClient.service +gwibber-accounts.1 +gwibber-accounts.desktop.in +gwibber-poster.1 +gwibber-preferences.desktop.in +gwibber.1 +gwibber.desktop.in +setup.cfg +setup.py +bin/gwibber +bin/gwibber-accounts +bin/gwibber-poster +bin/gwibber-preferences +bin/gwibber-service +gwibber/__init__.py +gwibber/accounts.py +gwibber/actions.py +gwibber/client.py +gwibber/error.py +gwibber/gwui.py +gwibber/pidgin.py +gwibber/preferences.py +gwibber/util.py +gwibber/lib/__init__.py +gwibber/lib/gtk/__init__.py +gwibber/lib/gtk/widgets.py +gwibber/microblog/__init__.py +gwibber/microblog/brightkite.py +gwibber/microblog/can.py +gwibber/microblog/config.py +gwibber/microblog/dispatcher.py +gwibber/microblog/greader.py +gwibber/microblog/gwp.py +gwibber/microblog/jaiku.py +gwibber/microblog/network.py +gwibber/microblog/opencollaboration.py +gwibber/microblog/rss.py +gwibber/microblog/storage.py +gwibber/microblog/swp.py +gwibber/microblog/plugins/__init__.py +gwibber/microblog/plugins/buzz/__init__.py +gwibber/microblog/plugins/buzz/gtk/__init__.py +gwibber/microblog/plugins/buzz/gtk/buzz/__init__.py +gwibber/microblog/plugins/buzz/ui/gwibber-accounts-buzz.ui +gwibber/microblog/plugins/buzz/ui/icons/16x16/buzz.png +gwibber/microblog/plugins/buzz/ui/icons/22x22/buzz.png +gwibber/microblog/plugins/buzz/ui/icons/32x32/buzz.png +gwibber/microblog/plugins/digg/__init__.py +gwibber/microblog/plugins/digg/gtk/__init__.py +gwibber/microblog/plugins/digg/gtk/digg/__init__.py +gwibber/microblog/plugins/digg/ui/gwibber-accounts-digg.ui +gwibber/microblog/plugins/facebook/__init__.py +gwibber/microblog/plugins/facebook/gtk/__init__.py +gwibber/microblog/plugins/facebook/gtk/facebook/__init__.py +gwibber/microblog/plugins/facebook/ui/gwibber-accounts-facebook.ui +gwibber/microblog/plugins/flickr/__init__.py +gwibber/microblog/plugins/flickr/gtk/__init__.py +gwibber/microblog/plugins/flickr/gtk/flickr/__init__.py +gwibber/microblog/plugins/flickr/ui/gwibber-accounts-flickr.ui +gwibber/microblog/plugins/foursquare/__init__.py +gwibber/microblog/plugins/foursquare/gtk/__init__.py +gwibber/microblog/plugins/foursquare/gtk/foursquare/__init__.py +gwibber/microblog/plugins/foursquare/ui/gwibber-accounts-foursquare.ui +gwibber/microblog/plugins/foursquare/ui/icons/16x16/foursquare.png +gwibber/microblog/plugins/foursquare/ui/icons/22x22/foursquare.png +gwibber/microblog/plugins/foursquare/ui/icons/32x32/foursquare.png +gwibber/microblog/plugins/foursquare/ui/icons/scalable/foursquare.png +gwibber/microblog/plugins/friendfeed/__init__.py +gwibber/microblog/plugins/friendfeed/gtk/__init__.py +gwibber/microblog/plugins/friendfeed/gtk/friendfeed/__init__.py +gwibber/microblog/plugins/friendfeed/ui/gwibber-accounts-friendfeed.ui +gwibber/microblog/plugins/identica/__init__.py +gwibber/microblog/plugins/identica/gtk/__init__.py +gwibber/microblog/plugins/identica/gtk/identica/__init__.py +gwibber/microblog/plugins/identica/ui/gwibber-accounts-identica.ui +gwibber/microblog/plugins/pingfm/__init__.py +gwibber/microblog/plugins/pingfm/gtk/__init__.py +gwibber/microblog/plugins/pingfm/gtk/pingfm/__init__.py +gwibber/microblog/plugins/pingfm/ui/gwibber-accounts-pingfm.ui +gwibber/microblog/plugins/qaiku/__init__.py +gwibber/microblog/plugins/qaiku/gtk/__init__.py +gwibber/microblog/plugins/qaiku/gtk/qaiku/__init__.py +gwibber/microblog/plugins/qaiku/ui/gwibber-accounts-qaiku.ui +gwibber/microblog/plugins/statusnet/__init__.py +gwibber/microblog/plugins/statusnet/gtk/__init__.py +gwibber/microblog/plugins/statusnet/gtk/statusnet/__init__.py +gwibber/microblog/plugins/statusnet/ui/gwibber-accounts-statusnet.ui +gwibber/microblog/plugins/twitter/__init__.py +gwibber/microblog/plugins/twitter/gtk/__init__.py +gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py +gwibber/microblog/plugins/twitter/ui/gwibber-accounts-twitter.ui +gwibber/microblog/urlshorter/__init__.py +gwibber/microblog/urlshorter/cligs.py +gwibber/microblog/urlshorter/isgd.py +gwibber/microblog/urlshorter/snipurlcom.py +gwibber/microblog/urlshorter/tinyurlcom.py +gwibber/microblog/urlshorter/ur1ca.py +gwibber/microblog/urlshorter/zima.py +gwibber/microblog/util/__init__.py +gwibber/microblog/util/const.py +gwibber/microblog/util/couchmigrate.py +gwibber/microblog/util/exceptions.py +gwibber/microblog/util/facelib.py +gwibber/microblog/util/imagehandler.py +gwibber/microblog/util/keyring.py +gwibber/microblog/util/log.py +gwibber/microblog/util/resources.py +indicator/gwibber +po/POTFILES.in +po/ar.po +po/ast.po +po/bg.po +po/bn.po +po/bs.po +po/ca.po +po/cs.po +po/cy.po +po/da.po +po/de.po +po/el.po +po/en_AU.po +po/en_CA.po +po/en_GB.po +po/eo.po +po/es.po +po/eu.po +po/fi.po +po/fil.po +po/fr.po +po/ga.po +po/gl.po +po/gu.po +po/gwibber.pot +po/hi.po +po/hr.po +po/hu.po +po/id.po +po/is.po +po/it.po +po/ja.po +po/kn.po +po/ko.po +po/lo.po +po/lv.po +po/ml.po +po/ms.po +po/nb.po +po/nl.po +po/nn.po +po/pl.po +po/pt.po +po/pt_BR.po +po/ro.po +po/ru.po +po/si.po +po/sk.po +po/sl.po +po/sq.po +po/sr.po +po/sv.po +po/te.po +po/th.po +po/tr.po +po/uk.po +po/zh_CN.po +po/zh_HK.po +po/zh_TW.po +ui/gwibber-about-dialog.ui +ui/gwibber-accounts-dialog.ui +ui/gwibber-preferences-dialog.ui +ui/gwibber.png +ui/gwibber.svg +ui/progress.gif +ui/icons/breakdance/16x16/brightkite.png +ui/icons/breakdance/16x16/brightkite.svg +ui/icons/breakdance/16x16/digg.png +ui/icons/breakdance/16x16/digg.svg +ui/icons/breakdance/16x16/facebook.png +ui/icons/breakdance/16x16/facebook.svg +ui/icons/breakdance/16x16/flickr.png +ui/icons/breakdance/16x16/flickr.svg +ui/icons/breakdance/16x16/friendfeed.png +ui/icons/breakdance/16x16/friendfeed.svg +ui/icons/breakdance/16x16/identica.png +ui/icons/breakdance/16x16/identica.svg +ui/icons/breakdance/16x16/jaiku.png +ui/icons/breakdance/16x16/jaiku.svg +ui/icons/breakdance/16x16/openid.png +ui/icons/breakdance/16x16/openid.svg +ui/icons/breakdance/16x16/pingfm.png +ui/icons/breakdance/16x16/pingfm.svg +ui/icons/breakdance/16x16/qaiku.png +ui/icons/breakdance/16x16/qaiku.svg +ui/icons/breakdance/16x16/statusnet.png +ui/icons/breakdance/16x16/statusnet.svg +ui/icons/breakdance/16x16/stumbleupon.png +ui/icons/breakdance/16x16/stumbleupon.svg +ui/icons/breakdance/16x16/twitter.png +ui/icons/breakdance/16x16/twitter.svg +ui/icons/breakdance/22x22/brightkite.png +ui/icons/breakdance/22x22/brightkite.svg +ui/icons/breakdance/22x22/digg.png +ui/icons/breakdance/22x22/digg.svg +ui/icons/breakdance/22x22/facebook.png +ui/icons/breakdance/22x22/facebook.svg +ui/icons/breakdance/22x22/flickr.png +ui/icons/breakdance/22x22/flickr.svg +ui/icons/breakdance/22x22/friendfeed.png +ui/icons/breakdance/22x22/friendfeed.svg +ui/icons/breakdance/22x22/identica.png +ui/icons/breakdance/22x22/identica.svg +ui/icons/breakdance/22x22/jaiku.png +ui/icons/breakdance/22x22/jaiku.svg +ui/icons/breakdance/22x22/openid.png +ui/icons/breakdance/22x22/openid.svg +ui/icons/breakdance/22x22/pingfm.png +ui/icons/breakdance/22x22/pingfm.svg +ui/icons/breakdance/22x22/qaiku.png +ui/icons/breakdance/22x22/qaiku.svg +ui/icons/breakdance/22x22/statusnet.png +ui/icons/breakdance/22x22/statusnet.svg +ui/icons/breakdance/22x22/stumbleupon.png +ui/icons/breakdance/22x22/stumbleupon.svg +ui/icons/breakdance/22x22/twitter.png +ui/icons/breakdance/22x22/twitter.svg +ui/icons/breakdance/scalable/brightkite.png +ui/icons/breakdance/scalable/brightkite.svg +ui/icons/breakdance/scalable/digg.png +ui/icons/breakdance/scalable/digg.svg +ui/icons/breakdance/scalable/facebook.png +ui/icons/breakdance/scalable/facebook.svg +ui/icons/breakdance/scalable/flickr.png +ui/icons/breakdance/scalable/flickr.svg +ui/icons/breakdance/scalable/friendfeed.png +ui/icons/breakdance/scalable/friendfeed.svg +ui/icons/breakdance/scalable/identica.png +ui/icons/breakdance/scalable/identica.svg +ui/icons/breakdance/scalable/jaiku.png +ui/icons/breakdance/scalable/jaiku.svg +ui/icons/breakdance/scalable/openid.png +ui/icons/breakdance/scalable/openid.svg +ui/icons/breakdance/scalable/pingfm.png +ui/icons/breakdance/scalable/pingfm.svg +ui/icons/breakdance/scalable/qaiku.png +ui/icons/breakdance/scalable/qaiku.svg +ui/icons/breakdance/scalable/statusnet.png +ui/icons/breakdance/scalable/statusnet.svg +ui/icons/breakdance/scalable/stumbleupon.png +ui/icons/breakdance/scalable/stumbleupon.svg +ui/icons/breakdance/scalable/twitter.png +ui/icons/breakdance/scalable/twitter.svg +ui/icons/streams/16x16/favorites.png +ui/icons/streams/16x16/group.png +ui/icons/streams/16x16/home.png +ui/icons/streams/16x16/images.png +ui/icons/streams/16x16/links.png +ui/icons/streams/16x16/list.png +ui/icons/streams/16x16/lists.png +ui/icons/streams/16x16/messages.png +ui/icons/streams/16x16/private.png +ui/icons/streams/16x16/public.png +ui/icons/streams/16x16/replies.png +ui/icons/streams/16x16/search.png +ui/icons/streams/16x16/sent.png +ui/icons/streams/16x16/thread.png +ui/icons/streams/16x16/user.png +ui/icons/streams/16x16/videos.png +ui/icons/streams/24x24/favorite.png +ui/icons/streams/24x24/group.png +ui/icons/streams/24x24/home.png +ui/icons/streams/24x24/images.png +ui/icons/streams/24x24/links.png +ui/icons/streams/24x24/list.png +ui/icons/streams/24x24/lists.png +ui/icons/streams/24x24/messages.png +ui/icons/streams/24x24/private.png +ui/icons/streams/24x24/public.png +ui/icons/streams/24x24/replies.png +ui/icons/streams/24x24/search.png +ui/icons/streams/24x24/sent.png +ui/icons/streams/24x24/user.png +ui/icons/streams/24x24/videos.png +ui/icons/streams/32x32/favorite.png +ui/icons/streams/32x32/group.png +ui/icons/streams/32x32/home.png +ui/icons/streams/32x32/images.png +ui/icons/streams/32x32/links.png +ui/icons/streams/32x32/list.png +ui/icons/streams/32x32/lists.png +ui/icons/streams/32x32/messages.png +ui/icons/streams/32x32/private.png +ui/icons/streams/32x32/public.png +ui/icons/streams/32x32/replies.png +ui/icons/streams/32x32/search.png +ui/icons/streams/32x32/user.png +ui/icons/streams/32x32/videos.png +ui/templates/base.mako +ui/templates/css.mako +ui/templates/defaultcss.mako +ui/templates/jquery.js +ui/templates/navigation.mako +ui/templates/targetbar.mako +ui/themes/compact/comment.png +ui/themes/compact/errors.mako +ui/themes/compact/favorite.png +ui/themes/compact/jquery.js +ui/themes/compact/template.mako +ui/themes/compact/theme.version +ui/themes/default/comment.png +ui/themes/default/errors.mako +ui/themes/default/favorite.png +ui/themes/default/jquery.js +ui/themes/default/template.mako +ui/themes/default/theme.version +ui/themes/flat/comment.png +ui/themes/flat/errors.mako +ui/themes/flat/favorite.png +ui/themes/flat/jquery.js +ui/themes/flat/list-add.png +ui/themes/flat/loading.png +ui/themes/flat/mail-reply-all.png +ui/themes/flat/mail-reply-sender.png +ui/themes/flat/template.mako +ui/themes/flat/theme.css +ui/themes/flat/theme.version +ui/themes/gwilouche/comment.png +ui/themes/gwilouche/errors.mako +ui/themes/gwilouche/favorite.png +ui/themes/gwilouche/jquery.js +ui/themes/gwilouche/list-add.png +ui/themes/gwilouche/loading.png +ui/themes/gwilouche/mail-reply-all.png +ui/themes/gwilouche/mail-reply-sender.png +ui/themes/gwilouche/template.mako +ui/themes/gwilouche/theme.css +ui/themes/gwilouche/theme.version +ui/themes/simple/comment.png +ui/themes/simple/errors.mako +ui/themes/simple/favorite.png +ui/themes/simple/jquery.js +ui/themes/simple/list-add.png +ui/themes/simple/loading.png +ui/themes/simple/mail-reply-all.png +ui/themes/simple/mail-reply-sender.png +ui/themes/simple/template.mako +ui/themes/simple/theme.css +ui/themes/simple/theme.version +ui/themes/ubuntu/comment.png +ui/themes/ubuntu/errors.mako +ui/themes/ubuntu/favorite.png +ui/themes/ubuntu/jquery.js +ui/themes/ubuntu/main.css +ui/themes/ubuntu/template.mako +ui/themes/ubuntu/theme.version +ui/themes/ubuntu/images/blueBackground.png +ui/themes/ubuntu/images/blueCurves.png +ui/themes/ubuntu/images/blueIndicator.png +ui/themes/ubuntu/images/blueIndicator2.png +ui/themes/ubuntu/images/greenBackground.png +ui/themes/ubuntu/images/greenCurves.png +ui/themes/ubuntu/images/greenIndicator.png +ui/themes/ubuntu/images/greenIndicator2.png +ui/themes/ubuntu/images/redBackground.png +ui/themes/ubuntu/images/redCurves.png +ui/themes/ubuntu/images/redIndicator.png +ui/themes/ubuntu/images/redIndicator2.png +ui/themes/ubuntu/images/steelBackground.png +ui/themes/ubuntu/images/steelCurves.png +ui/themes/ubuntu/images/steelHeading.jpg +ui/themes/ubuntu/images/steelIndicator.png +ui/themes/ubuntu/images/steelIndicator2.png +ui/themes/ubuntu/images/typing-left.png +ui/themes/ubuntu/images/typing-right.png +ui/themes/ubuntu/images/yellowBackground.png +ui/themes/ubuntu/images/yellowCurves.png +ui/themes/ubuntu/images/yellowHeading.jpg +ui/themes/ubuntu/images/yellowIndicator.png +ui/themes/ubuntu/images/yellowIndicator2.png +ui/themes/ubuntu/images/yellowTL.png +ui/themes/ubuntu/images/yellowTR.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/PKG-INFO new/gwibber-3.0.0.1/PKG-INFO --- old/gwibber-3.0.0/PKG-INFO 2011-04-05 23:08:46.000000000 +0200 +++ new/gwibber-3.0.0.1/PKG-INFO 2011-04-08 08:02:04.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: gwibber -Version: 3.0.0 +Version: 3.0.0.1 Summary: UNKNOWN Home-page: http://launchpad.net/gwibber/ Author: Ryan Paul diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/bin/gwibber-client new/gwibber-3.0.0.1/bin/gwibber-client --- old/gwibber-3.0.0/bin/gwibber-client 2011-04-05 23:06:50.000000000 +0200 +++ new/gwibber-3.0.0.1/bin/gwibber-client 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (C) 2011 Canonical Ltd -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# 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, see <http://www.gnu.org/licenses/>. -# -# Copyright (C) 2010 Ken VanDine <[email protected]> -# -# A cli client for Gwibber -# - - -###################################################################### -# Setup path -from os.path import join, dirname, exists, realpath, abspath -import sys -import subprocess - -LAUNCH_DIR = abspath(sys.path[0]) -SOURCE_DIR = join(LAUNCH_DIR, "..", "gwibber") - -# If we were invoked from a Gwibber source directory add that as the -# preferred module path ... -if exists(join(SOURCE_DIR, "client.py")): - sys.path.insert(0, realpath(dirname(SOURCE_DIR))) - try: - from gwibber.microblog.util import log - log.logger.name = "Gwibber Client" - log.logger.info("Running from the source tree") - from gwibber import client - finally: - del sys.path[0] -else: - from gwibber.microblog.util import log - log.logger.name = "Gwibber Client" - log.logger.info("Running from the system path") - from gwibber import client -###################################################################### - -import gwibber.microblog.util -import gettext -from gettext import lgettext as _ - -###################################################################### -# Options -from optparse import OptionParser -parser = OptionParser() -parser.add_option("-r", "--refresh", action="store_true", - dest="refresh", - help=_("Refresh operation in the Gwibber Service")) -parser.add_option("-q", "--quit", action="store_true", - dest="quit", - help=_("Shutdown the Gwibber Service")) -parser.add_option("-m", "--message", dest="message", - help=_("Message to post")) -(options, args) = parser.parse_args() -###################################################################### - -service = gwibber.microblog.util.getbus("Service") - -if options.refresh: - service.Refresh() - sys.exit() - -if options.quit: - service.Quit() - subprocess.call(["pkill", "gwibber"]) - sys.exit() - -if options.message: - service.SendMessage(message) - sys.exit() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/bin/gwibber-poster new/gwibber-3.0.0.1/bin/gwibber-poster --- old/gwibber-3.0.0/bin/gwibber-poster 2011-04-05 23:06:50.000000000 +0200 +++ new/gwibber-3.0.0.1/bin/gwibber-poster 2011-04-06 20:58:53.000000000 +0200 @@ -93,8 +93,10 @@ if not options.window: self.connect("focus-out-event", self.on_window_close) - self.poster = widgets.GwibberPosterVBox() - self.poster.connect("expose-event", self.on_expose_input) + if options.message: + self.poster = widgets.GwibberPosterVBox(content=options.message) + else: + self.poster = widgets.GwibberPosterVBox() self.poster.input.connect("submit", self.on_input_activate) self.poster.button_send.connect("clicked", self.on_button_send_clicked) @@ -103,10 +105,6 @@ self.add(self.poster) self.show_all() - def on_expose_input(self, *args): - if options.message: - self.poster.input.set_text(options.message) - def on_input_activate(self, *args): if not options.persist: self.on_window_close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/gwibber/gwui.py new/gwibber-3.0.0.1/gwibber/gwui.py --- old/gwibber-3.0.0/gwibber/gwui.py 2011-04-05 23:06:50.000000000 +0200 +++ new/gwibber-3.0.0.1/gwibber/gwui.py 2011-04-06 20:58:53.000000000 +0200 @@ -962,10 +962,10 @@ "clear": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, ()) } - def __init__(self): + def __init__(self, content=None): gtk.Frame.__init__(self) - self.textview = InputTextView() + self.textview = InputTextView(content=content) self.textview.connect("submit", self.do_submit_event) self.textview.connect("clear", self.do_clear_event) self.textview.get_buffer().connect("changed", self.do_changed_event) @@ -1006,11 +1006,13 @@ "clear": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, ()) } - def __init__(self): + def __init__(self, content=None): gtk.TextView.__init__(self) self.drawable = None self.model = Model() + self.content = content + self.overlay_color = util.get_theme_colors()["text"].darker(3).hex self.overlay_text = '<span weight="bold" size="xx-large" foreground="%s">%s</span>' @@ -1028,7 +1030,7 @@ # set properties self.set_border_width(0) self.set_accepts_tab(True) - self.set_editable(True) + self.set_editable(False) self.set_cursor_visible(True) self.set_wrap_mode(gtk.WRAP_WORD_CHAR) self.set_left_margin(2) @@ -1105,6 +1107,10 @@ ww, wh = self.drawable.get_size() tw, th = self.pango_overlay.get_pixel_size() self.drawable.draw_layout(gc, ww - tw - 2, wh - th, self.pango_overlay) + self.set_editable(True) + if self.content: + self.get_buffer().set_text(self.content) + self.content = None def on_text_changed(self, w): chars = self.get_char_count() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/gwibber/lib/gtk/widgets.py new/gwibber-3.0.0.1/gwibber/lib/gtk/widgets.py --- old/gwibber-3.0.0/gwibber/lib/gtk/widgets.py 2011-04-05 23:06:50.000000000 +0200 +++ new/gwibber-3.0.0.1/gwibber/lib/gtk/widgets.py 2011-04-06 20:58:53.000000000 +0200 @@ -37,14 +37,14 @@ gettext.textdomain('gwibber') class GwibberPosterVBox(gtk.VBox): - def __init__(self): + def __init__(self, content=None): gtk.VBox.__init__(self) DBusGMainLoop(set_as_default=True) loop = gobject.MainLoop() self.service = gwibber.microblog.util.getbus("Service") self.stream_model = gwibber.gwui.Model() - self.input = gwibber.gwui.Input() + self.input = gwibber.gwui.Input(content=content) self.input.connect("submit", self.on_input_activate) self.input.connect("changed", self.on_input_changed) self.input_splitter = gtk.VPaned() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/gwibber/microblog/dispatcher.py new/gwibber-3.0.0.1/gwibber/microblog/dispatcher.py --- old/gwibber-3.0.0/gwibber/microblog/dispatcher.py 2011-04-05 23:06:50.000000000 +0200 +++ new/gwibber-3.0.0.1/gwibber/microblog/dispatcher.py 2011-04-08 07:59:33.000000000 +0200 @@ -12,6 +12,13 @@ from util import resources from util import exceptions from util.const import * +import subprocess + +try: + from gi.repository import Unity, Dbusmenu +except: + Unity = None + Dbusmenu = None # Try to import * from custom, install custom.py to include packaging # customizations like distro API keys, etc @@ -27,6 +34,8 @@ gobject.threads_init() +log.logger.name = "Gwibber Dispatcher" + # Dynamically build a list of available service plugins PROTOCOLS = {} for p in util.resources.get_plugin_dirs()[0]: @@ -40,7 +49,10 @@ SERVICES = dict([(k, v.PROTOCOL_INFO) for k, v in PROTOCOLS.items()]) SETTINGS = config.Preferences() -log.logger.name = "Gwibber Dispatcher" +if SETTINGS["interval"] < 5: + #log.logger.info( "Migrating refresh interval from %d to %d", SETTINGS["interval"], 5) + SETTINGS["interval"] = 5 + def perform_operation((account, opname, args, transient)): try: @@ -275,6 +287,31 @@ for s in "messages", "replies", "private": self.unseen_counts[s] = 0 + if Unity and Dbusmenu: + launcher = Unity.LauncherEntry.get_for_desktop_id ("gwibber.desktop") + ql = Dbusmenu.Menuitem.new () + refresh_menu = Dbusmenu.Menuitem.new () + refresh_menu.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Refresh")) + refresh_menu.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, True) + refresh_menu.connect("item-activated", self.refresh) + ql.child_append (refresh_menu) + accounts_menu = Dbusmenu.Menuitem.new () + accounts_menu.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Accounts")) + accounts_menu.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, True) + accounts_menu.connect("item-activated", self.show_accounts) + ql.child_append (accounts_menu) + preferences_menu = Dbusmenu.Menuitem.new () + preferences_menu.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Preferences")) + preferences_menu.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, True) + preferences_menu.connect("item-activated", self.show_preferences) + ql.child_append (preferences_menu) + quit_menu = Dbusmenu.Menuitem.new () + quit_menu.property_set (Dbusmenu.MENUITEM_PROP_LABEL, _("Quit")) + quit_menu.property_set_bool (Dbusmenu.MENUITEM_PROP_VISIBLE, True) + quit_menu.connect("item-activated", self.shutdown) + ql.child_append (quit_menu) + launcher.set_property("quicklist", ql) + self.refresh_count = 0 self.mainloop = loop self.workerpool = multiprocessing.Pool() @@ -296,6 +333,16 @@ self.accounts_service.connect_to_signal("Deleted", self.on_account_deleted) self.accounts_service.connect_to_signal("Created", self.on_account_created) + def show_preferences(self, *args): + subprocess.Popen("gwibber-preferences", shell=False) + + def show_accounts(self, *args): + subprocess.Popen("gwibber-accounts", shell=False) + + def shutdown(self, *args): + subprocess.Popen(["pkill", "gwibber"], shell=False) + self.Quit() + def do_maintenance(self, *args): # perform some needed MessageManager maintenance if self.maint_timer_id: @@ -722,7 +769,7 @@ log.logger.debug("*** Sending Message ***") self.perform_async_operation(operations) - def refresh(self): + def refresh(self, *args): if self.refresh_timer_id: gobject.source_remove(self.refresh_timer_id) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/gwibber/microblog/util/const.py new/gwibber-3.0.0.1/gwibber/microblog/util/const.py --- old/gwibber-3.0.0/gwibber/microblog/util/const.py 2011-04-05 23:08:20.000000000 +0200 +++ new/gwibber-3.0.0.1/gwibber/microblog/util/const.py 2011-04-08 07:59:33.000000000 +0200 @@ -62,7 +62,7 @@ "service": "{R} @{nick}: {text}", } -VERSION_NUMBER = "3.0.0" +VERSION_NUMBER = "3.0.0.1" GCONF_CLIENT_DIR = "/apps/gwibber/client/" BUG_URL = "https://bugs.launchpad.net/gwibber/+filebug"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/gwibber.desktop.in new/gwibber-3.0.0.1/gwibber.desktop.in --- old/gwibber-3.0.0/gwibber.desktop.in 2011-04-05 23:06:50.000000000 +0200 +++ new/gwibber-3.0.0.1/gwibber.desktop.in 2011-04-08 07:59:33.000000000 +0200 @@ -8,25 +8,4 @@ Icon=gwibber Categories=GTK;GNOME;Network; X-GNOME-Gettext-Domain=gwibber -X-Ayatana-Desktop-Shortcuts=Gwibber;Refresh;Accounts;Preferences;Quit X-Ayatana-Appmenu-Show-Stubs=False - -[Refresh Shortcut Group] -_Name=Refresh -Exec=gwibber-client -r -TargetEnvironment=Unity - -[Accounts Shortcut Group] -_Name=Accounts -Exec=gwibber-accounts -TargetEnvironment=Unity - -[Preferences Shortcut Group] -_Name=Preferences -Exec=gwibber-preferences -TargetEnvironment=Unity - -[Quit Shortcut Group] -_Name=Quit -Exec=gwibber-client -q -TargetEnvironment=Unity diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/setup.py new/gwibber-3.0.0.1/setup.py --- old/gwibber-3.0.0/setup.py 2011-04-05 23:08:07.000000000 +0200 +++ new/gwibber-3.0.0.1/setup.py 2011-04-08 07:59:33.000000000 +0200 @@ -7,7 +7,7 @@ from glob import glob setup(name="gwibber", - version="3.0.0", # UPDATE gwibber/microblog/util/const.py too + version="3.0.0.1", # UPDATE gwibber/microblog/util/const.py too author="Ryan Paul", author_email="[email protected]", url="http://launchpad.net/gwibber/";, @@ -103,7 +103,7 @@ ('share/gwibber/ui/icons/streams/scalable', glob("ui/icons/streams/scalable/*.svg")), ('/usr/share/indicators/messages/applications', ['indicator/gwibber']), ], - scripts=['bin/gwibber', 'bin/gwibber-service', 'bin/gwibber-poster', 'bin/gwibber-accounts', 'bin/gwibber-preferences', 'bin/gwibber-client'], + scripts=['bin/gwibber', 'bin/gwibber-service', 'bin/gwibber-poster', 'bin/gwibber-accounts', 'bin/gwibber-preferences'], cmdclass = { "build" : build_extra.build_extra, "build_i18n" : build_i18n.build_i18n, "build_help" : build_help.build_help, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwibber-3.0.0/ui/gwibber-preferences-dialog.ui new/gwibber-3.0.0.1/ui/gwibber-preferences-dialog.ui --- old/gwibber-3.0.0/ui/gwibber-preferences-dialog.ui 2011-04-05 23:06:50.000000000 +0200 +++ new/gwibber-3.0.0.1/ui/gwibber-preferences-dialog.ui 2011-04-07 03:22:00.000000000 +0200 @@ -4,8 +4,8 @@ <!-- interface-naming-policy toplevel-contextual --> <object class="GtkAdjustment" id="adjustment1"> <property name="value">2</property> - <property name="lower">1</property> - <property name="upper">100</property> + <property name="lower">5</property> + <property name="upper">240</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> ++++++ gwibber-3.1.0-nm09.diff ++++++ diff -ruN gwibber-3.1.0+bzr990.orig/gwibber/microblog/dispatcher.py gwibber-3.1.0+bzr990/gwibber/microblog/dispatcher.py --- gwibber-3.1.0+bzr990.orig/gwibber/microblog/dispatcher.py 2011-04-24 12:20:43.764863491 +0100 +++ gwibber-3.1.0+bzr990/gwibber/microblog/dispatcher.py 2011-04-26 14:07:44.681852312 +0100 @@ -818,14 +818,10 @@ def on_connection_changed(self, state): log.logger.debug("Network state changed, new state is %d", state) """ - NM_STATE_UNKNOWN = 0 - NM_STATE_ASLEEP = 1 - NM_STATE_CONNECTING = 2 - NM_STATE_CONNECTED = 3 - NM_STATE_DISCONNECTED = 4 + See util/const.py for states. """ - if state == NM_STATE_CONNECTED: + if state in NM_CONNECTED_STATES: log.logger.info("Network state changed to Online") self.ConnectionOnline() else: @@ -844,7 +840,7 @@ log.logger.info("Can't determine network state, assuming online") return True try: - if self.nm.state() == NM_STATE_CONNECTED: + if self.nm.state() in NM_CONNECTED_STATES: return True else: return False diff -ruN gwibber-3.1.0+bzr990.orig/gwibber/microblog/util/const.py gwibber-3.1.0+bzr990/gwibber/microblog/util/const.py --- gwibber-3.1.0+bzr990.orig/gwibber/microblog/util/const.py 2011-04-24 12:20:43.799863106 +0100 +++ gwibber-3.1.0+bzr990/gwibber/microblog/util/const.py 2011-04-26 14:08:44.102472290 +0100 @@ -74,12 +74,24 @@ NM_DBUS_SERVICE = "org.freedesktop.NetworkManager" NM_DBUS_OBJECT_PATH = "/org/freedesktop/NetworkManager" NM_DBUS_INTERFACE = "org.freedesktop.NetworkManager" -NM_STATE_UNKNOWN = 0 -NM_STATE_ASLEEP = 1 -NM_STATE_CONNECTING = 2 -NM_STATE_CONNECTED = 3 -NM_STATE_DISCONNECTED = 4 +NM_STATE_ASLEEP_OLD = 1 +NM_STATE_CONNECTING_OLD = 2 +NM_STATE_CONNECTED_OLD = 3 +NM_STATE_DISCONNECTED_OLD = 4 +NM_STATE_ASLEEP = 10, +NM_STATE_DISCONNECTED = 20, +NM_STATE_DISCONNECTING = 30, +NM_STATE_CONNECTING = 40, +NM_STATE_CONNECTED_LOCAL = 50, +NM_STATE_CONNECTED_SITE = 60, +NM_STATE_CONNECTED_GLOBAL = 70 +NM_CONNECTED_STATES = ( + NM_STATE_CONNECTED_OLD, + NM_STATE_CONNECTED_LOCAL, + NM_STATE_CONNECTED_SITE, + NM_STATE_CONNECTED_GLOBAL +) GWIBBER_OPERATIONS = """ { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
