Merge lp:~dpm/ubuntu/lucid/gwibber/update-pot into lp:ubuntu/lucid/gwibber

[David Planella]

[David Planella (dpm)]

The new version of Gwibber, apart from being awesome, has added a few new translatable strings.

However, these cannot be translated because the POT template is not up to date. Here's a branch that simply updates the POT template after having run 'cd po; intltool-update -p -g gwibber'. Once the file is committed, these strings will be automatically exposed in Launchpad, so that translators can do their work.

I'd recommend always updating the POT template (*) a few days before a new release and sending an announcement to launchpad-translators(at)lists(dot)launchpad(dot)net so that they are aware that there are new strings to translate.

One thing I've also noticed is that gwibber is not using automatic bzr exports of translations. Enabling this will allow maintainers not having to worry anymore about manually exporting translations from Launchpad, as they can be automatically committed daily to a branch of your choice and effectively adding more automation to the translations process. This is also beneficial for translators, which then know that their translations are committed straight away to the project.

* To enable automatic exports, simply go to https://translations.launchpad.net/gwibber/trunk/+translations-settings and choose a branch where translations will be exported to. Direct link: https://translations.launchpad.net/gwibber/trunk/+link-translations-branch.

(Beware of the fact that at the moment, team-owned branches don't work as expected. To work around this, make yourself the owner of the branch, set it as the translations branch, and then make the team the owner of the branch again. More details at https://help.launchpad.net/Translations/YourProject/Exports)

All this shouldn't take more than a few minutes, and will greatly improve the translations process and usability for international users. If you need any help, I'll be glad to give a hand, just ping me on IRC.

(*) In time, Launchpad Translations will grow the ability of automatically regenerating the template, but for now it has to be manually updated.

[James Westby (james-w)]

Hey David,

Did you intend this change to be made to the Ubuntu package
or upstream?

Thanks,

James

[David Planella (dpm)]

Hey James,

It was intended to be against gwibber upstream. I cannot recall why I branched off the lucid package, but it might have well been a mistake. Sorry for any confusion this might have caused.

The merge proposal simply updated the POT file, so that new strings could be translatable. It seems that in the meantime it has been updated already upstream, and they've followed the suggestion of using automatic translation exports as well, so I think the merge proposal can be at this point considered obsolete.

Cheers,
David.

[James Westby (james-w)]

Hi David,

Thanks for letting me know, I've rejected this as it is taken care of.

Thanks,

James

Unmerged revisions

586. By David Planella on 2010-02-11

Refreshed POT template with new strings

585. By Ryan Paul on 2010-02-11

Remember position of the sidebar

584. By Ryan Paul on 2010-02-10

When replying to a thread, don't put original user's name in the message

583. By Ryan Paul on 2010-02-10

Adjust theme CSS to improve support for dark themes

582. By Ken VanDine on 2010-02-08

tagged 2.29.1

581. By Ken VanDine on 2010-02-08

added simple and flat themes to setup.py

580. By Ken VanDine on 2010-02-08

merged

579. By Ken VanDine on 2010-02-08

* Fixed up the GwibberPosterVBox to include the Send button
* Fixed some gettext issues so localizing will work when we get
  the translations updated.

578. By Ken VanDine on 2010-02-08

Install the images for the ubuntu theme in the images dir

577. By Ken VanDine on 2010-02-08

images shouldn't be executable

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2010-02-11 10:03:14 +0000
@@ -0,0 +1,3 @@
+gwibber/semantic.cache
+semantic.cache
+*.mo

=== added file 'AUTHORS'
--- AUTHORS	1970-01-01 00:00:00 +0000
+++ AUTHORS	2010-02-11 10:03:14 +0000
@@ -0,0 +1,26 @@
+Gwibber Authors
+---------------
+ 
+  * Ryan Paul (SegPhault) <[e-mail]>
+  * Dominic Evans <[e-mail]>
+  * Greg Grossmeier <[e-mail]>
+  * Ken VanDine <[e-mail]>
+
+Localization and Translations
+-----------------------------
+
+  * Milo Casagrande <[e-mail]>
+  * Julián Alarcón <[e-mail]>
+
+Other Contributors
+------------------
+
+  * James Westby <[e-mail]>
+  * Alexander Sack <[e-mail]>
+  * David Futcher <[e-mail]>
+  * Jussi Kekkonen <[e-mail]>
+  * Jordan Mantha <[e-mail]>
+  * Steve Smith <[e-mail]>
+  * Fabian Neumann
+  * Bruno Bord
+  * Michael Elkins

=== renamed file 'AUTHORS' => 'AUTHORS.moved'
=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2010-02-11 10:03:14 +0000
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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; either version 2 of the License, or
+    (at your option) any later version.
+
+    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.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

=== renamed file 'COPYING' => 'COPYING.moved'
=== added file 'INSTALL'
--- INSTALL	1970-01-01 00:00:00 +0000
+++ INSTALL	2010-02-11 10:03:14 +0000
@@ -0,0 +1,41 @@
+Installing Gwibber
+==================
+
+  Requirements
+  ------------
+
+	Please note that the version numbers listed below only reflect my test
+	environment. Gwibber is known to work with those specific versions, but
+	will probably work fine on most current desktop distributions that include
+	Python's WebKit GTK+ bindings.
+
+    * python (2.5)
+    * python-dbus (0.80.2)
+    * python-gtk2 (2.10.4)
+    * python-gconf (2.18.0)
+    * python-imaging (1.1.6)
+    * python-notify (0.1.1)
+    * python-webkitgtk (1.0.1)
+    * python-simplejson (1.9.1)
+    * python-egenix-mxdatetime (3.0.0)
+    * python-distutils-extra
+    * python-feedparser (4.1)
+    * python-xdg (0.15)
+    * python-mako (0.2.2)
+
+  Installation
+  ------------
+
+	Gwibber uses Python's distutils framework for installation. In order to
+	install Gwibber, you will need root access. To install Gwibber, perform
+	the following command as root:
+
+      $ python setup.py install
+
+  Run Gwibber
+  -----------
+
+	If you installed Gwibber using the setup.py script, you can launch the
+	program by typing "gwibber" at the command line. If you want to run
+	Gwibber without installing it, start "bin/gwibber" from within the
+	Gwibber directory.

=== renamed file 'INSTALL' => 'INSTALL.moved'
=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2010-02-11 10:03:14 +0000
@@ -0,0 +1,16 @@
+include AUTHORS COPYING INSTALL README
+include MANIFEST.in MANIFEST
+include com.Gwibber.Service.service
+include com.GwibberClient.service
+include po/*
+include ui/*
+include ui/templates/*
+include ui/themes/*/*
+include ui/icons/*
+include ui/icons/*/*
+include gwibber.1
+include gwibber-poster.1
+include gwibber.desktop.in gwibber.desktop
+include gwibber-preferences.desktop.in gwibber-preferences.desktop
+include gwibber-accounts.desktop.in gwibber-accounts.desktop
+include indicator/gwibber

=== renamed file 'MANIFEST.in' => 'MANIFEST.in.moved'
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2010-02-11 10:03:14 +0000
@@ -0,0 +1,6 @@
+Gwibber
+-------
+
+Gwibber is a status management client application for the GNOME desktop
+environment. It can transmit status message updates to Twitter, Jaiku,
+Facebook, and Pidgin.

=== renamed file 'README' => 'README.moved'
=== added directory 'bin'
=== renamed directory 'bin' => 'bin.moved'
=== added file 'bin/gwibber'
--- bin/gwibber	1970-01-01 00:00:00 +0000
+++ bin/gwibber	2010-02-11 10:03:14 +0000
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+
+"""
+
+Gwibber Client
+SegPhault (Ryan Paul) - 05/29/2007
+
+"""
+
+import sys, logging, gtk, optparse, dbus
+from os.path import join, dirname, exists, realpath, abspath
+from dbus.mainloop.glib import DBusGMainLoop
+
+######################################################################
+# Options and configuration
+def parse_opts():
+    usage = "usage: %prog [options] <config-file>"
+
+    oparse = optparse.OptionParser(usage=usage)
+
+    oparse.add_option("-v", "--verbose", action="store_true",
+                      help="Verbose messages", default=False)
+    oparse.add_option("-d", "--debug", action="store_true",
+                      help="Debug messages", default=False)
+
+    opts, rest = oparse.parse_args()
+    return opts
+    
+opts = parse_opts()
+
+if opts.debug:
+    logging.root.setLevel(logging.DEBUG)
+elif opts.verbose:
+    logging.root.setLevel(logging.INFO)
+
+
+######################################################################
+# Setup path
+
+LAUNCH_DIR = abspath(sys.path[0])
+SOURCE_DIR = join(LAUNCH_DIR, "..", "gwibber")
+logging.debug("Launched from %s", LAUNCH_DIR)
+
+DBusGMainLoop(set_as_default=True)
+obj = dbus.SessionBus().get_object("org.desktopcouch.CouchDB", "/")
+cdb = dbus.Interface(obj, "org.desktopcouch.CouchDB")
+cdb.getPort()
+
+# If we were invoked from a Gwibber source directory add that as the
+# preferred module path ...
+if exists(join(SOURCE_DIR, "client.py")):
+    logging.info("Running Gwibber from the source tree")
+    sys.path.insert(0, realpath(dirname(SOURCE_DIR)))
+    try:
+        from gwibber import client
+    finally:
+        del sys.path[0]
+else:
+    logging.debug("Running Gwibber from the system path")
+    from gwibber import client
+
+client.Client()
+gtk.main()

=== added file 'bin/gwibber-accounts'
--- bin/gwibber-accounts	1970-01-01 00:00:00 +0000
+++ bin/gwibber-accounts	2010-02-11 10:03:14 +0000
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2010 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 <[e-mail]>
+#
+# Launch script for Gwibber Accounts
+#
+
+import logging
+import sys
+from os.path import join, dirname, exists, realpath, abspath
+import gtk, gobject
+from dbus.mainloop.glib import DBusGMainLoop
+
+######################################################################
+# Setup path
+
+LAUNCH_DIR = abspath(sys.path[0])
+logging.debug("Launched from %s", LAUNCH_DIR)
+source_tree_gwibber = join(LAUNCH_DIR, "..", "gwibber")
+
+# If we were invoked from a Gwibber source directory add that as the
+# preferred module path ...
+if exists(join(source_tree_gwibber, "client.py")):
+    logging.info("Running from source tree; adjusting path")
+    sys.path.insert(0, realpath(dirname(source_tree_gwibber)))
+    try:
+        from gwibber import accounts
+    finally:
+        del sys.path[0]
+else:
+    logging.debug("Assuming path is correct")
+    from gwibber import accounts
+
+DBusGMainLoop(set_as_default=True)
+accounts.GwibberAccountManager()
+gtk.main()

=== added file 'bin/gwibber-poster'
--- bin/gwibber-poster	1970-01-01 00:00:00 +0000
+++ bin/gwibber-poster	2010-02-11 10:03:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2010 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 <[e-mail]>
+#
+# A poster for Gwibber
+#
+
+
+######################################################################
+# Setup path
+from os.path import join, dirname, exists, realpath, abspath
+import sys
+
+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 import client
+    finally:
+        del sys.path[0]
+else:
+    from gwibber import client
+######################################################################
+
+from gwibber.lib.gtk import widgets
+import gtk
+import gwibber.gwui, gwibber.util, gwibber.resources
+
+from optparse import OptionParser
+parser = OptionParser()
+parser.add_option("-p", "--persist", action="store_true",
+                  dest="persist", default=False,
+                  help="Don't exit after posting")
+parser.add_option("-w", "--window", action="store_true",
+                  dest="window", default=False,
+                  help="Don't exit when the window loses focus, also implies -d")
+parser.add_option("-d", "--decorate", action="store_true",
+                  dest="decorate", default=False,
+                  help="Display window decorations")
+parser.add_option("-m", "--message", dest="message",
+                  help="Message to post")
+(options, args) = parser.parse_args()
+
+class GwibberPosterWindow(gtk.Window):
+  def __init__(self):
+    gtk.Window.__init__(self)
+    self.set_default_size(420,140)
+    self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
+    self.set_title("Gwibber Poster")
+    gtk.icon_theme_add_builtin_icon("gwibber", 22,
+      gtk.gdk.pixbuf_new_from_file_at_size(
+        gwibber.resources.get_ui_asset("gwibber.svg"), 24, 24))
+    self.set_icon_name("gwibber")
+
+    self.connect("delete-event", self.on_window_close)
+
+    if not options.decorate and not options.window:
+      self.set_decorated(False)
+
+    if not options.window:
+      self.connect("focus-out-event", self.on_window_close)
+
+    poster = widgets.GwibberPosterVBox()
+
+    poster.input.connect("submit", self.on_input_activate)
+
+    self.add(poster)
+    self.show_all()
+
+    if options.message:
+      poster.input.set_text(options.message)
+  
+  def on_input_activate(self, *args):
+    if not options.persist:
+      self.on_window_close()
+
+  def on_window_close(self, *args):
+    gtk.main_quit()
+
+
+w = GwibberPosterWindow()
+gtk.main()

=== added file 'bin/gwibber-preferences'
--- bin/gwibber-preferences	1970-01-01 00:00:00 +0000
+++ bin/gwibber-preferences	2010-02-11 10:03:14 +0000
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2010 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 <[e-mail]>
+#
+# Launch script for Gwibber Preferences
+#
+
+
+import logging
+import sys
+from os.path import join, dirname, exists, realpath, abspath
+import gtk, gobject
+
+######################################################################
+# Setup path
+
+LAUNCH_DIR = abspath(sys.path[0])
+logging.debug("Launched from %s", LAUNCH_DIR)
+source_tree_gwibber = join(LAUNCH_DIR, "..", "gwibber")
+
+# If we were invoked from a Gwibber source directory add that as the
+# preferred module path ...
+if exists(join(source_tree_gwibber, "client.py")):
+    logging.info("Running from source tree; adjusting path")
+    sys.path.insert(0, realpath(dirname(source_tree_gwibber)))
+    try:
+        from gwibber import preferences
+    finally:
+        del sys.path[0]
+else:
+    logging.debug("Assuming path is correct")
+    from gwibber import preferences
+
+preferences.GwibberPreferences()
+gtk.main()

=== added file 'bin/gwibber-service'
--- bin/gwibber-service	1970-01-01 00:00:00 +0000
+++ bin/gwibber-service	2010-02-11 10:03:14 +0000
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+
+import sys, logging, optparse, gobject, dbus
+from os.path import join, dirname, exists, realpath, abspath
+
+from dbus.mainloop.glib import DBusGMainLoop
+
+logging.basicConfig(level=logging.DEBUG)
+
+DBusGMainLoop(set_as_default=True)
+loop = gobject.MainLoop()
+
+obj = dbus.SessionBus().get_object("org.desktopcouch.CouchDB", "/")
+cdb = dbus.Interface(obj, "org.desktopcouch.CouchDB")
+cdb.getPort()
+
+LAUNCH_DIR = abspath(sys.path[0])
+SOURCE_DIR = join(LAUNCH_DIR, "..", "gwibber")
+DISPATCHER = join(SOURCE_DIR, "microblog", "dispatcher.py")
+
+# If we were invoked from a Gwibber source directory add that as the
+# preferred module path ...
+
+if exists(DISPATCHER):
+  logging.debug("Running Gwibber from the source tree")
+  sys.path.insert(0, realpath(dirname(SOURCE_DIR)))
+
+  try:
+    from gwibber.microblog import dispatcher
+  finally:
+    del sys.path[0]
+
+else:
+  logging.debug("Running Gwibber from the system path")
+  from gwibber.microblog import dispatcher
+
+connection_monitor = dispatcher.ConnectionMonitor()
+account_monitor = dispatcher.AccountMonitor()
+stream_monitor = dispatcher.StreamMonitor()
+message_monitor = dispatcher.MessagesMonitor()
+urlshortener = dispatcher.URLShorten()
+
+dispatcher = dispatcher.Dispatcher(loop)
+dispatcher.daemon = True
+dispatcher.start()
+loop.run()

=== added file 'com.Gwibber.Service.service'
--- com.Gwibber.Service.service	1970-01-01 00:00:00 +0000
+++ com.Gwibber.Service.service	2010-02-11 10:03:14 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.Gwibber.Service
+Exec=/usr/bin/gwibber-service

=== renamed file 'com.Gwibber.Service.service' => 'com.Gwibber.Service.service.moved'
=== added file 'com.GwibberClient.service'
--- com.GwibberClient.service	1970-01-01 00:00:00 +0000
+++ com.GwibberClient.service	2010-02-11 10:03:14 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.GwibberClient
+Exec=/usr/bin/gwibber

=== renamed file 'com.GwibberClient.service' => 'com.GwibberClient.service.moved'
=== added directory 'gwibber'
=== added file 'gwibber-accounts.desktop.in'
--- gwibber-accounts.desktop.in	1970-01-01 00:00:00 +0000
+++ gwibber-accounts.desktop.in	2010-02-11 10:03:14 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Gwibber
+_GenericName=Social Accounts
+_X-GNOME-FullName=Gwibber Social Accounts
+Type=Application
+_Comment=Microblogging client for GNOME
+Exec=gwibber-accounts
+Icon=gwibber
+Categories=GTK;GNOME;Settings;

=== renamed file 'gwibber-accounts.desktop.in' => 'gwibber-accounts.desktop.in.moved'
=== added file 'gwibber-poster.1'
--- gwibber-poster.1	1970-01-01 00:00:00 +0000
+++ gwibber-poster.1	2010-02-11 10:03:14 +0000
@@ -0,0 +1,31 @@
+.\" Process this file with
+.\" groff -man -Tascii gwibber.1
+.\"
+.TH GWIBBER-POSTER 1 "JANUARY 2010" Linux "User Manuals"
+.SH NAME
+Gwibber \- Microblogging client for GNOME
+.SH SYNOPSIS
+.B gwibber-poster [
+.I OPTIONS
+.B ]
+.SH DESCRIPTION
+.B Gwibber
+is an open source microblogging client for GNOME developed with Python and GTK. It supports Twitter, Jaiku, Identi.ca, Facebook, Flickr, Digg, and RSS.
+.SH OPTIONS
+.IP "-h, --help"
+Show help message and exit
+.IP "-p, --persist"
+Don't exit after posting
+.IP "-w, --window"
+Don't exit when the window loses focus, also implies -d
+.IP "-d, --decorate"
+Display window decorations
+.IP "-m, --message"
+Message to post
+.SH BUGS
+Please report all bugs to the Gwibber bug tracker:
+http://bugs.launchpad.net/gwibber
+.SH AUTHOR
+Ken VanDine <[e-mail]>
+
+Copyright 2010.  Licensed under a Creative Commons Attribution-ShareAlike License <http://creativecommons.org/licenses/by-sa/3.0/>

=== renamed file 'gwibber-poster.1' => 'gwibber-poster.1.moved'
=== added file 'gwibber-preferences.desktop.in'
--- gwibber-preferences.desktop.in	1970-01-01 00:00:00 +0000
+++ gwibber-preferences.desktop.in	2010-02-11 10:03:14 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Gwibber
+_GenericName=Social Settings
+_X-GNOME-FullName=Gwibber Social Settings
+Type=Application
+_Comment=Microblogging client for GNOME
+Exec=gwibber-preferences
+Icon=gwibber
+Categories=GTK;GNOME;Settings;

=== renamed file 'gwibber-preferences.desktop.in' => 'gwibber-preferences.desktop.in.moved'
=== added file 'gwibber.1'
--- gwibber.1	1970-01-01 00:00:00 +0000
+++ gwibber.1	2010-02-11 10:03:14 +0000
@@ -0,0 +1,27 @@
+.\" Process this file with
+.\" groff -man -Tascii gwibber.1
+.\"
+.TH GWIBBER 1 "FEBRUARY 2009" Linux "User Manuals"
+.SH NAME
+Gwibber \- Microblogging client for GNOME
+.SH SYNOPSIS
+.B gwibber [
+.I OPTIONS
+.B ]
+.SH DESCRIPTION
+.B Gwibber
+is an open source microblogging client for GNOME developed with Python and GTK. It supports Twitter, Jaiku, Identi.ca, Facebook, Flickr, Digg, and RSS.
+.SH OPTIONS
+.IP "-h, --help"
+Show help message and exit
+.IP "-v, --verbose"
+Verbose messages
+.IP "-d, --debug"
+Debug messages
+.SH BUGS
+Please report all bugs to the Gwibber bug tracker:
+http://launchpad.net/gwibber
+.SH AUTHOR
+Greg Grossmeier <[e-mail]>
+
+Copyright 2009.  Licensed under a Creative Commons Attribution-ShareAlike License <http://creativecommons.org/licenses/by-sa/3.0/>

=== renamed file 'gwibber.1' => 'gwibber.1.moved'
=== added file 'gwibber.desktop'
--- gwibber.desktop	1970-01-01 00:00:00 +0000
+++ gwibber.desktop	2010-02-11 10:03:14 +0000
@@ -0,0 +1,56 @@
+[Desktop Entry]
+Name=Gwibber
+X-GNOME-FullName=Gwibber Social Client
+Type=Application
+Comment=Microblogging client for GNOME
+Comment[ar]=خادم المدونات القصيرة لجنوم
+Comment[bg]=Микроблог клиент за GNOME
+Comment[ca]=Client de Microblogging per a GNOME
+Comment[cy]=Cleient microblogio ar gyfer GNOME
+Comment[da]=Mikroblogging klient til GNOME
+Comment[de]=Mikro-Blogging-Klient für GNOME
+Comment[en_CA]=Microblogging client for GNOME
+Comment[en_GB]=Microblogging client for GNOME
+Comment[es]=Cliente de microblogging para GNOME
+Comment[fi]=Mikrobloggausohjelma Gnomelle
+Comment[fr]=Client de microblogging pour GNOME
+Comment[it]=Client GNOME per micro-blog
+Comment[lo]=Microblogging client ສຳລັບ GNOME
+Comment[nb]=Mikroblogging klient for GNOME
+Comment[nl]=Microblogging-cliënt voor GNOME
+Comment[pl]=Klient mikroblogowania dla GNOME
+Comment[pt]=Cliente de Microblogging para o GNOME
+Comment[pt_BR]=Cliente microblog para GNOME
+Comment[ru]=Клиент GNOME для микроблоггинга
+Comment[sv]=Mikroblogg klient för GNOME
+Comment[tr]=GNOME için mikroblog istemcisi
+Comment[uk]=Клієнт Мікроблоґування длч GNOME
+Comment[zh_CN]=基于GNOME的微博客客户端
+Exec=gwibber
+Icon=gwibber
+Categories=GTK;GNOME;Network;
+GenericName=Microblogging Client
+GenericName[ar]=خادم المدونات القصيرة
+GenericName[bg]=Микроблог клиент
+GenericName[ca]=Client de Microblogging
+GenericName[cy]=Cleient Microblogio
+GenericName[da]=Mikroblogging klient
+GenericName[de]=Mikro-Blogging-Klient
+GenericName[en_CA]=Microblogging Client
+GenericName[en_GB]=Microblogging Client
+GenericName[es]=Cliente de microblogging
+GenericName[fi]=Mikrobloggausohjelma
+GenericName[fr]=Client de Microblogging
+GenericName[id]=Microblogging Client
+GenericName[it]=Client per micro-blog
+GenericName[lo]=Microblogging Client
+GenericName[nb]=Mikroblogging Klient
+GenericName[nl]=Microblogging-cliënt
+GenericName[pl]=Klient mikroblogowania
+GenericName[pt]=Cliente de Microbogging
+GenericName[pt_BR]=Cliente Microblog
+GenericName[ru]=Клиент для микроблоггинга
+GenericName[sv]=Mikroblogg Klient
+GenericName[tr]=Mikroblog İstemcisi
+GenericName[uk]=Клієнт Мікроблоґування
+GenericName[zh_CN]=微博客客户端

=== added file 'gwibber.desktop.in'
--- gwibber.desktop.in	1970-01-01 00:00:00 +0000
+++ gwibber.desktop.in	2010-02-11 10:03:14 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Gwibber
+_GenericName=Social Client
+_X-GNOME-FullName=Gwibber Social Client
+Type=Application
+_Comment=Microblogging client for GNOME
+Exec=gwibber
+Icon=gwibber
+Categories=GTK;GNOME;Network;

=== renamed file 'gwibber.desktop.in' => 'gwibber.desktop.in.moved'
=== renamed file 'gwibber.desktop' => 'gwibber.desktop.moved'
=== renamed directory 'gwibber' => 'gwibber.moved'
=== added file 'gwibber/__init__.py'
=== added file 'gwibber/accounts.py'
--- gwibber/accounts.py	1970-01-01 00:00:00 +0000
+++ gwibber/accounts.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,331 @@
+#
+# Copyright (C) 2010 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 <[e-mail]>
+#
+# Accounts interface for Gwibber
+#
+
+import pygtk
+try:
+    pygtk.require("2.0") 
+except:
+    print "Requires pygtk 2.0 or later"
+    exit
+
+import gettext
+from gettext import lgettext as _
+if hasattr(gettext, 'bind_textdomain_codeset'):
+    gettext.bind_textdomain_codeset('gwibber','UTF-8')
+gettext.textdomain('gwibber')
+
+from . import resources
+import gtk
+import json
+import gwibber.lib
+import gwibber.gwui
+import gwibber.util
+from gwibber.lib.gtk import *
+
+from microblog.util.const import *
+
+from desktopcouch.records.server import CouchDatabase
+from desktopcouch.records.record import Record as CouchRecord
+
+from dbus.mainloop.glib import DBusGMainLoop
+DBusGMainLoop(set_as_default=True)
+
+
+
+class GwibberAccountManager(object):
+
+    def __init__(self):
+        self.pub = gwibber.lib.GwibberPublic()
+        self.ui = gtk.Builder()
+        self.ui.add_from_file (resources.get_ui_asset("gwibber-accounts-dialog.ui"))
+        self.ui.connect_signals(self)
+        dialog = self.ui.get_object("accounts_dialog")
+        gtk.icon_theme_add_builtin_icon("gwibber", 22,
+            gtk.gdk.pixbuf_new_from_file_at_size(
+            resources.get_ui_asset("gwibber.svg"), 24, 24))
+        dialog.set_icon_name("gwibber")
+        self.accounts_tree = self.ui.get_object("accounts_tree")
+
+        #self.pub.MonitorAccountChanged(self.load_accounts)
+        #self.pub.MonitorAccountDeleted(self.load_accounts)
+
+        dialog.show_all()
+        
+        # hide the help button until we have help :)
+        button_help = self.ui.get_object("button_help")
+        button_help.hide()
+
+        self.gwibber_service = gwibber.util.getbus("Service")
+
+        # FIXME: this should check for configured accounts, and if there are any hide this
+        self.ui.get_object('frame_new_account').hide()
+        self.ui.get_object('vbox_save').hide()
+        self.ui.get_object('vbox_create').hide()
+
+        self.protocols = json.loads(self.pub.GetServices())
+        self.load_accounts()
+        self.icon_column = gtk.TreeViewColumn('Icon') 
+        self.name_column = gtk.TreeViewColumn('Account') 
+        self.accounts_tree.append_column(self.icon_column)
+        self.accounts_tree.append_column(self.name_column)
+        self.celltxt = gtk.CellRendererText() 
+        self.cellimg = gtk.CellRendererPixbuf()
+        self.icon_column.pack_start(self.cellimg, False) 
+        self.name_column.pack_start(self.celltxt, True) 
+        self.icon_column.add_attribute(self.cellimg, 'pixbuf', 1) 
+        self.name_column.add_attribute(self.celltxt, 'text', 0) 
+        if len(self.accounts_tree.get_model()) > 0:
+            self.accounts_tree.set_cursor(0)
+
+
+    def account_verify(self, account):
+        for required in self.protocols[account['protocol']]['config']:
+            try:
+                required = required.split(":")[1]
+            except:
+                pass
+            if not self.account.has_key(required):
+                return False
+        return True
+
+    def load_accounts(self, *args):
+        accounts_store = gtk.TreeStore(
+            str, # Account name
+            gtk.gdk.Pixbuf, # Icon
+            str) # Protocol properties
+        self.accounts_tree.set_model(accounts_store)
+        self.accounts = json.loads(self.pub.GetAccounts())
+        if len(self.accounts) == 0:
+            self.add_account()
+            return
+	for self.account in self.accounts:
+            if self.account_verify(self.account):
+                try:
+                    icf = resources.icon(self.account["protocol"], use_theme=False) or resources.get_ui_asset("icons/breakdance/16x16/%s.png" % self.account["protocol"])
+                    icon = gtk.gdk.pixbuf_new_from_file(icf)
+                except:
+                    icf = resources.get_ui_asset("gwibber.svg")
+                    icon = gtk.icon_theme_add_builtin_icon("gwibber", 22,
+                                                           gtk.gdk.pixbuf_new_from_file_at_size(
+                                                           resources.get_ui_asset("gwibber.svg"), 16, 16))
+                accounts_store.append(None, [self.account["protocol"] + " (" + self.account["username"] + ")", icon, self.account])
+        if len(self.accounts_tree.get_model()) > 0:
+            self.accounts_tree.set_cursor(0)
+        else:
+            self.add_account()    
+
+    def on_edit_account(self, widget, data=None):
+        self.ui.get_object('vbox_save').show()
+        self.ui.get_object('vbox_create').hide()
+        #if self.button_edit_save_handler_id:
+        #    self.ui.get_object("button_edit_save").disconnect(self.button_edit_save_handler_id)
+        self.button_edit_save_handler_id = self.ui.get_object("button_edit_save").connect_after("clicked", self.on_edit_account_save)
+        self.button_edit_cancel_handler_id = self.ui.get_object("button_edit_cancel").connect_after("clicked", self.on_edit_account_cancel)
+        self.button_create_save_handler_id = self.ui.get_object("button_create_save").connect_after("clicked", self.on_edit_account_save)
+        self.button_create_cancel_handler_id = self.ui.get_object("button_create_cancel").connect_after("clicked", self.on_edit_account_cancel)
+
+    def on_edit_account_cancel(self, widget):
+        self.ui.get_object('vbox_save').hide()
+        self.ui.get_object('vbox_create').hide()
+        self.ui.get_object("button_edit_cancel").disconnect(self.button_edit_cancel_handler_id)
+        self.ui.get_object("button_create_cancel").disconnect(self.button_create_cancel_handler_id)
+        if len(self.accounts_tree.get_model()) > 0:
+            self.accounts_tree.set_cursor(0)
+        else:
+            self.add_account()    
+
+    def on_account_delete(self, widget):
+        accounts = CouchDatabase(COUCH_DB_ACCOUNTS, create=True)
+        if self.account.has_key("_id"):
+            if accounts.record_exists(self.account["_id"]):
+                accounts.delete_record(self.account["_id"])
+        self.load_accounts()
+        if len(self.accounts_tree.get_model()) > 0:
+            self.accounts_tree.set_cursor(0)
+        else:
+            self.add_account()    
+        
+    def on_edit_account_save(self, widget):
+        self.get_account_data()
+        accounts = CouchDatabase(COUCH_DB_ACCOUNTS, create=True)
+        if not self.account_verify(self.account):
+            return False
+        if self.account.has_key("_id"):
+            if accounts.record_exists(self.account["_id"]):
+                accounts.update_fields(self.account["_id"], self.account)
+        else:
+            id = accounts.put_record(CouchRecord(self.account, record_type=COUCH_TYPE_ACCOUNT))
+            self.gwibber_service.PerformOp('{"account": "%s"}' % id)
+        self.ui.get_object('vbox_save').hide()
+        self.ui.get_object('vbox_create').hide()
+        self.ui.get_object("button_edit_save").disconnect(self.button_edit_save_handler_id)
+        self.ui.get_object("button_create_save").disconnect(self.button_create_save_handler_id)
+        # refresh the account tree
+        self.load_accounts()
+        return True
+
+    def on_button_add_activate(self, widget=None, data=None):
+        self.add_account()
+
+    def add_account(self):
+        # Populate protocols combobox
+        self.ui.get_object('frame_new_account').show()
+        self.ui.get_object('vbox_details').hide()
+        self.ui.get_object('vbox_account').hide()
+        self.ui.get_object('vbox_save').hide()
+        self.ui.get_object('vbox_create').hide()
+        protocol_combobox = self.ui.get_object("protocol_combobox")
+        protocol_store = gtk.ListStore(
+            str, # Protocol title
+            gtk.gdk.Pixbuf, # Icon
+            str) # Protocol properties
+
+        for name, properties in self.protocols.items():
+            icf = resources.icon(name, use_theme=False) or resources.get_ui_asset("icons/breakdance/16x16/%s.png" % name)
+            icon = gtk.gdk.pixbuf_new_from_file(icf)
+            protocol_store.append((properties['name'], icon, dict([('name', name), ('properties', properties)])))
+        protocol_combobox.clear()
+        protocol_combobox.set_model(protocol_store)
+        self.protocol_cell_txt = gtk.CellRendererText()
+        self.protocol_cell_img = gtk.CellRendererPixbuf()
+        protocol_combobox.pack_start(self.protocol_cell_img, False)
+        protocol_combobox.pack_start(self.protocol_cell_txt, False)
+        protocol_combobox.add_attribute(self.protocol_cell_img, 'pixbuf', 1)
+        protocol_combobox.add_attribute(self.protocol_cell_txt, 'text', 0)
+        protocol_combobox.set_active(0)
+        # End populate protocols combobox
+
+    def on_button_create_clicked(self, widget, data=None):
+        model = widget.get_model()
+        iter = widget.get_active_iter()
+        protocol_title = model.get_value(iter, 0)
+        icon = model.get_value(iter, 1)
+        protocol = eval(model.get_value(iter, 2))
+        self.account_show(protocol=protocol, icon=icon)
+
+    def account_show(self, protocol=None, icon=None):
+        if protocol is not None:
+            new_account = True
+        else:
+            new_account = False
+            protocol = dict([('name', self.account['protocol']), ('properties', self.protocols[self.account['protocol']])])
+
+        vbox_account = self.ui.get_object('vbox_account')
+        for child in vbox_account.get_children():
+            child.destroy()
+        vbox_details = self.ui.get_object('vbox_details')
+        self.ui.get_object('vbox_details').show()
+        self.ui.get_object('vbox_account').show()
+        self.ui.get_object('frame_new_account').hide()
+        label = self.ui.get_object('label_name')
+        image_type = self.ui.get_object('image_type')
+        label.set_label(protocol["properties"]["name"])
+        if icon:
+            image_type.set_from_pixbuf(icon)
+        try:
+          if not new_account:
+              self.aw = eval(protocol["name"]).AccountWidget(self.account)
+          else:
+              self.aw = eval(protocol["name"]).AccountWidget()
+          self.aw.show()
+	except NameError:
+          print ("%s not available", protocol["name"])
+        vbox_account.pack_start(self.aw, False, False)
+        vbox_account.show()
+        if new_account:
+            self.account = {}
+            self.account["protocol"] = protocol["name"]
+            self.ui.get_object('vbox_create').show()
+            self.button_edit_save_handler_id = self.ui.get_object("button_edit_save").connect_after("clicked", self.on_edit_account_save)
+            self.button_edit_cancel_handler_id = self.ui.get_object("button_edit_cancel").connect_after("clicked", self.on_edit_account_cancel)
+            self.button_create_save_handler_id = self.ui.get_object("button_create_save").connect_after("clicked", self.on_edit_account_save)
+            self.button_create_cancel_handler_id = self.ui.get_object("button_create_cancel").connect_after("clicked", self.on_edit_account_cancel)
+        self.aw.account = self.account
+        self.populate_account_data()
+
+    def populate_account_data(self):
+        # set the default color based on default defined by the service module
+        if self.protocols[self.account["protocol"]].has_key("color"):
+            self.aw.ui.get_object("color").set_color(gtk.color_selection_palette_from_string(self.protocols[self.account["protocol"]]["color"])[0])
+        try:
+            for config in self.protocols[self.account["protocol"]]["config"]:
+                if config == "private:password": config = "password"
+                if isinstance (self.aw.ui.get_object(config), gtk.Entry):
+                    self.aw.ui.get_object(config).set_text(self.account[config])
+                    self.aw.ui.get_object(config).connect("changed", self.on_edit_account)
+                if isinstance (self.aw.ui.get_object(config), gtk.CheckButton):
+                    self.aw.ui.get_object(config).set_active(self.account[config])
+                    self.aw.ui.get_object(config).connect("toggled", self.on_edit_account)
+                if isinstance (self.aw.ui.get_object(config), gtk.ColorButton):
+                    self.aw.ui.get_object(config).set_color(gtk.color_selection_palette_from_string(self.account[config])[0])
+                    self.aw.ui.get_object(config).connect("color-set", self.on_edit_account)
+        except:
+            pass
+
+    def get_account_data(self):
+        try:
+            del self.account["_rev"]
+        except:
+            pass
+        try:
+            for value in self.aw.account:
+                self.account[value] = self.aw.account[value]
+        except:
+            pass
+
+        for config in self.protocols[self.account["protocol"]]["config"]:
+            if config == "private:password": config = "password"
+            try:
+                try:
+                    value = self.aw.ui.get_object(config).get_text()
+                    self.account[config] = value
+                except:
+                    pass
+                try:
+                    value = self.aw.ui.get_object(config).get_property("active")
+                    self.account[config] = value
+                except:
+                    pass
+                try:
+                    value = gtk.color_selection_palette_to_string(gtk.color_selection_palette_from_string(
+                            self.aw.ui.get_object(config).get_color().to_string()))
+                    self.account[config] = value
+                except:
+                    pass
+            except:
+                break
+
+    def on_accounts_dialog_destroy(self, widget, data=None):
+        gtk.main_quit()
+
+    def on_accounts_tree_row_activated(self, widget, data=None):
+        icon = None
+        model, rows = widget.get_selection().get_selected_rows()
+	if rows:
+            for row in rows:
+                iter = model.get_iter(row)
+            self.account = eval(model.get_value(iter, 2))
+            icon = model.get_value(iter, 1)
+        self.ui.get_object('vbox_save').hide()
+        self.ui.get_object('vbox_create').hide()
+        self.account_show(icon=icon)
+
+    def on_button_close_clicked(self, widget, data=None):
+        gtk.main_quit()  

=== added file 'gwibber/actions.py'
--- gwibber/actions.py	1970-01-01 00:00:00 +0000
+++ gwibber/actions.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,164 @@
+import gtk, gwui, microblog, resources, util, json
+from microblog.util.const import *
+
+class MessageAction:
+  icon = None
+  label = None
+
+  @classmethod
+  def get_icon_path(self, size=16, use_theme=True):
+    return resources.icon(self.icon, size, use_theme)
+    
+  @classmethod
+  def include(self, client, msg):
+    return self.__name__ in client.model.services[msg["protocol"]]["features"]
+
+  @classmethod
+  def action(self, w, client, msg):
+    pass
+
+class reply(MessageAction):
+  icon = "mail-reply-sender"
+  label = "_Reply"
+
+  @classmethod
+  def action(self, w, client, msg):
+    client.reply(msg)
+    
+class thread(MessageAction):
+  icon = "mail-reply-all"
+  label = "View reply t_hread"
+
+  @classmethod
+  def action(self, w, client, msg):
+    tab_label = msg.original_title if hasattr(msg, "original_title") else msg.text
+    client.add_transient_stream(msg.account, "thread",
+        "message:/" + msg.gwibber_path, "Thread")
+
+class retweet(MessageAction):
+  icon = "mail-forward"
+  label = "R_etweet"
+
+  @classmethod
+  def action(self, w, client, msg):
+    if "retweet" in client.model.services[msg["protocol"]]["features"]:
+      text = RETWEET_FORMATS[client.model.settings["retweet_style"]]
+      symbol = "RD" if msg["protocol"] == "identica" else "RT"
+      text = text.format(text=msg["text"], nick=msg["sender"]["nick"], R=symbol)
+
+      if not client.model.settings["global_retweet"]:
+        client.message_target.set_target(msg, "repost")
+        
+      client.input.set_text(text)
+      client.input.textview.grab_focus()
+      buf = client.input.textview.get_buffer()
+      buf.place_cursor(buf.get_end_iter())
+
+class like(MessageAction):
+  icon = "bookmark_add"
+  label = "_Like this message"
+
+  @classmethod
+  def action(self, w, client, msg):
+    client.model.service.PerformOp(json.dumps({
+      "account": msg["account"],
+      "operation": "like",
+      "args": {"message": msg},
+      "transient": False,
+    }))
+    
+    d = gtk.MessageDialog(buttons=gtk.BUTTONS_OK)
+    d.set_markup("You have marked this message as liked.")
+    if d.run(): d.destroy()
+
+class delete(MessageAction):
+  icon = "gtk-delete"
+  label = "_Delete this message"
+
+  @classmethod
+  def action(self, w, client, msg):
+    client.model.service.PerformOp(json.dumps({
+      "account": msg["account"],
+      "operation": "delete",
+      "args": {"message": msg},
+      "transient": False,
+    }))
+
+    d = gtk.MessageDialog(buttons=gtk.BUTTONS_OK)
+    d.set_markup("The message has been deleted.")
+    if d.run(): d.destroy()
+
+  @classmethod
+  def include(self, client, msg):
+    if "delete" in client.model.services[msg["protocol"]]["features"]:
+      if msg.get("sender", {}).get("is_me", 0):
+        return True
+
+class search(MessageAction):
+  icon = "gtk-find"
+  label = "_Search for a query"
+
+  @classmethod
+  def action(self, w, client, query=None):
+    pass
+
+class read(MessageAction):
+  icon = "mail-read"
+  label = "View _Message"
+
+  @classmethod
+  def action(self, w, client, msg):
+    util.load_url(msg["url"])
+
+  @classmethod
+  def include(self, client, msg):
+    return "url" in msg
+
+class user(MessageAction):
+  icon = "face-monkey"
+  label = "View user _Profile"
+  
+  @classmethod
+  def action(self, w, client, acct=None, name=None):
+    client.add_stream({
+      "name": name,
+      "account": acct,
+      "operation": "user_messages",
+      "parameters": {"id": name, "count": 50},
+    })
+
+class menu(MessageAction):
+  @classmethod
+  def action(self, w, client, msg):
+    client.on_message_action_menu(msg)
+
+class tag(MessageAction):
+  @classmethod
+  def action(self, w, client, query):
+    print "Searching for tag", query
+
+class group(MessageAction):
+  icon = "face-monkey"
+
+  @classmethod
+  def action(self, w, client, acct, query):
+    client.add_transient_stream(acct, "group", query)
+    print "Searching for group", query
+
+class tomboy(MessageAction):
+  icon = "tomboy"
+  label = "Save to _Tomboy"
+
+  @classmethod
+  def action(self, w, client, msg):
+    util.create_tomboy_note(
+      "%s message from %s at %s\n\n%s\n\nSource: %s" % (
+        client.model.services[msg["protocol"]]["name"],
+        msg["sender"]["name"], msg["time"],
+        msg["text"], msg["url"]))
+
+  @classmethod
+  def include(self, client, msg):
+    return util.service_is_running("org.gnome.Tomboy")
+
+MENU_ITEMS = [reply, thread, retweet, read, user, like, delete, tomboy]

=== added file 'gwibber/client.py'
--- gwibber/client.py	1970-01-01 00:00:00 +0000
+++ gwibber/client.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,467 @@
+#!/usr/bin/env python
+
+import gtk, gobject, gwui, util, resources, actions, json, gconf
+import subprocess, os
+import time, datetime
+
+import gettext
+from gettext import lgettext as _
+if hasattr(gettext, 'bind_textdomain_codeset'):
+    gettext.bind_textdomain_codeset('gwibber','UTF-8')
+gettext.textdomain('gwibber')
+
+from microblog.util.couch import RecordMonitor
+from desktopcouch.records.server import CouchDatabase
+from desktopcouch.records.record import Record as CouchRecord
+
+from microblog.util.const import *
+from dbus.mainloop.glib import DBusGMainLoop
+import dbus, dbus.service
+
+DBusGMainLoop(set_as_default=True)
+
+class GwibberClient(gtk.Window):
+  def __init__(self):
+    gtk.Window.__init__(self)
+    self.ui = gtk.Builder()
+
+    self.model = gwui.Model()
+    
+    self.service = self.model.daemon
+    self.service.connect_to_signal("LoadingStarted", self.on_loading_started)
+    self.service.connect_to_signal("LoadingComplete", self.on_loading_complete)
+
+    self.connection = util.getbus("Connection")
+    self.connection.connect_to_signal("ConnectionOnline", self.on_connection_online)
+    self.connection.connect_to_signal("ConnectionOffline", self.on_connection_offline)
+
+    util.getbus("Streams").connect_to_signal("SettingChanged", self.on_setting_changed)
+
+    if len(json.loads(self.service.GetAccounts())) == 0:
+      import upgrade
+      account_migrate = upgrade.GwibberAccountMigrate()
+      if not account_migrate.run():
+        if os.path.exists(os.path.join("bin", "gwibber-accounts")):
+          cmd = os.path.join("bin", "gwibber-accounts")
+        else:
+          cmd = "gwibber-accounts"
+        ret = 1
+        while ret != 0:
+          ret = subprocess.call([cmd])
+      self.service.Refresh()
+
+    self.setup_ui()
+    
+    # set state online/offline
+    if not self.connection.isConnected():
+      self.actions.get_action("refresh").set_sensitive(False)
+
+    gc = gconf.client_get_default()
+    gc.add_dir("/desktop/gnome/interface/font_name", gconf.CLIENT_PRELOAD_NONE)
+    gc.notify_add("/desktop/gnome/interface/font_name", self.on_font_changed)
+
+  def on_setting_changed(self):
+    self.update_view()
+
+  def on_font_changed(self, *args):
+    self.update_view()
+
+  def setup_ui(self):
+    self.set_title("Gwibber")
+    gtk.icon_theme_add_builtin_icon("gwibber", 22,
+      gtk.gdk.pixbuf_new_from_file_at_size(
+        resources.get_ui_asset("gwibber.svg"), 24, 24))
+    self.set_icon_name("gwibber")
+    self.connect("delete-event", self.on_window_close)
+   
+    # Load the application menu
+    menu_ui = self.setup_menu()
+    self.add_accel_group(menu_ui.get_accel_group())
+
+    # Create animated loading spinner
+    self.loading_spinner = gtk.Image()
+    menu_spin = gtk.ImageMenuItem("")
+    menu_spin.set_right_justified(True)
+    menu_spin.set_sensitive(False)
+    menu_spin.set_image(self.loading_spinner)
+
+    # Force the spinner to show in newer versions of Gtk
+    if hasattr(menu_spin, "set_always_show_image"):
+      menu_spin.set_always_show_image(True)
+
+    menubar = menu_ui.get_widget("/menubar_main")
+    menubar.append(menu_spin)
+    
+    view_class = getattr(gwui,
+        "MultiStreamUi" if len(self.model.settings["streams"]) > 1
+        else "SingleStreamUi")
+
+    self.stream_view = view_class(self.model)
+    self.stream_view.connect("action", self.on_action)
+    self.stream_view.connect("search", self.on_perform_search)
+    self.stream_view.connect("stream-changed", self.on_stream_changed)
+    self.stream_view.connect("stream-closed", self.on_stream_closed)
+    if isinstance(self.stream_view, gwui.MultiStreamUi):
+      self.stream_view.connect("pane-closed", self.on_pane_closed)
+    
+    self.input = gwui.Input()
+    self.input.connect("submit", self.on_input_activate)
+    self.input.connect("changed", self.on_input_changed)
+
+    self.input_splitter = gtk.VPaned()
+    self.input_splitter.pack1(self.stream_view, resize=True)
+    self.input_splitter.pack2(self.input, resize=False)
+
+    self.button_send = gtk.Button(_("Send"))
+    self.button_send.connect("clicked", self.on_button_send_clicked)
+
+    self.message_target = gwui.AccountTargetBar(self.model)
+    self.message_target.pack_end(self.button_send, False)
+    #self.message_target.pack_end(self.character_count, False)
+    self.message_target.connect("canceled", self.on_reply_cancel)
+
+    content = gtk.VBox(spacing=5)
+    content.pack_start(self.input_splitter, True)
+    content.pack_start(self.message_target, False)
+    content.set_border_width(5)
+    
+    layout = gtk.VBox()
+    layout.pack_start(menubar, False)
+    layout.pack_start(content, True)
+
+    self.add(layout)
+
+    # Apply the user's settings from CouchDB
+    self.resize(*self.model.settings["window_size"])
+    self.move(*self.model.settings["window_position"])
+    self.input_splitter.set_position(self.model.settings["window_splitter"])
+    self.show_all()
+
+    self.stream_view.set_state(self.model.settings["streams"] or DEFAULT_SETTINGS["streams"])
+    self.update_menu_availability()
+
+  def set_view(self, view=None):
+    state = None
+    if view: self.view_class = getattr(gwui, view)
+    if self.stream_view:
+      state = self.stream_view.get_state()
+      self.stream_view.destroy()
+    
+    self.stream_view = self.view_class(self.model)
+    self.stream_view.connect("action", self.on_action)
+    self.stream_view.connect("search", self.on_perform_search)
+    self.stream_view.connect("stream-changed", self.on_stream_changed)
+    self.stream_view.connect("stream-closed", self.on_stream_closed)
+    
+    if isinstance(self.stream_view, gwui.MultiStreamUi):
+      self.stream_view.connect("pane-closed", self.on_pane_closed)
+    
+    self.input_splitter.add1(self.stream_view)
+    self.stream_view.show_all()
+    if state: self.stream_view.set_state(state)
+
+  def setup_menu(self):
+    ui_string = """
+    <ui>
+      <menubar name="menubar_main">
+        <menu action="menu_gwibber">
+          <menuitem action="refresh" />
+          <menuitem action="search" />
+          <separator/>
+          <menuitem action="new_stream" />
+          <menuitem action="close_window" />
+          <menuitem action="close_stream" />
+          <separator/>
+          <menuitem action="quit" />
+        </menu>
+
+        <menu action="menu_edit">
+          <menuitem action="accounts" />
+          <menuitem action="preferences" />
+        </menu>
+
+        <menu action="menu_help">
+          <menuitem action="help_online" />
+          <menuitem action="help_translate" />
+          <menuitem action="help_report" />
+          <separator/>
+          <menuitem action="about" />
+        </menu>
+      </menubar>
+
+      <popup name="menu_tray">
+        <menuitem action="refresh" />
+        <separator />
+        <menuitem action="accounts" />
+        <menuitem action="preferences" />
+        <separator />
+        <menuitem action="quit" />
+      </popup>
+    </ui>
+    """
+
+    self.actions = gtk.ActionGroup("Actions")
+    self.actions.add_actions([
+      ("menu_gwibber", None, _("_Gwibber")),
+      ("menu_edit", None, _("_Edit")),
+      ("menu_help", None, _("_Help")),
+
+      ("refresh", gtk.STOCK_REFRESH, _("_Refresh"), "<ctrl>R", None, self.on_refresh),
+      ("search", gtk.STOCK_FIND, _("_Search"), "<ctrl>F", None, self.on_search),
+      ("accounts", None, _("_Accounts"), "<ctrl>A", None, self.on_accounts),
+      ("preferences", gtk.STOCK_PREFERENCES, _("_Preferences"), "<ctrl>P", None, self.on_preferences),
+      ("about", gtk.STOCK_ABOUT, _("_About"), None, None, self.on_about),
+      ("quit", gtk.STOCK_QUIT, _("_Quit"), "<ctrl>Q", None, self.on_quit),
+
+      ("new_stream", gtk.STOCK_NEW, _("_New Stream"), "<ctrl>n", None, self.on_new_stream),
+      ("close_window", gtk.STOCK_CLOSE, _("_Close Window"), "<ctrl><shift>W", None, self.on_window_close),
+      ("close_stream", gtk.STOCK_CLOSE, _("_Close Stream"), "<ctrl>W", None, self.on_close_stream),
+
+      ("help_online", None, _("Get Help Online..."), None, None, lambda *a: util.load_url("https://answers.launchpad.net/gwibber")),
+      ("help_translate", None, _("Translate This Application..."), None, None, lambda *a: util.load_url("https://translations.launchpad.net/gwibber")),
+      ("help_report", None, _("Report A Problem..."), None, None, lambda *a: util.load_url(BUG_URL)),
+    ])
+
+    
+    ui = gtk.UIManager()
+    ui.insert_action_group(self.actions, pos=0)
+    ui.add_ui_from_string(ui_string)
+    return ui
+
+  def update_menu_availability(self):
+    state = self.stream_view.get_state()
+    if state:
+      a = self.actions.get_action("close_stream")
+      a.set_visible(bool(state[0].get("transient", False)))
+
+  def update_view(self):
+    self.stream_view.update()
+
+  def reply(self, message):
+    features = self.model.services[message["protocol"]]["features"]
+    if "reply" in features:
+      if message["sender"].get("nick", 0) and not "thread" in features:
+        self.input.set_text("@%s: " % message["sender"]["nick"])
+      
+      self.message_target.set_target(message)
+      self.input.textview.grab_focus()
+      buf = self.input.textview.get_buffer()
+      buf.place_cursor(buf.get_end_iter())
+
+  def on_reply_cancel(self, widget):
+    self.input.clear()
+
+  def get_message(self, id):
+    return dict(self.model.messages.get_record(id).items())
+  
+  def on_refresh(self, *args):
+    self.service.Refresh()
+
+  def add_stream(self, data, kind=COUCH_TYPE_STREAM):
+    id = self.model.streams.put_record(CouchRecord(data, kind))
+    self.model.refresh()
+    self.service.PerformOp('{"id": "%s"}' % id)
+    
+    if "operation" in data:
+      stream = str(self.model.features[data["operation"]]["stream"])
+    else: stream = "search"
+
+    self.stream_view.new_stream({
+      "stream": stream,
+      "account": data.get("account", None),
+      "transient": id,
+    })
+    self.update_menu_availability()
+
+  def save_window_settings(self):
+    self.model.settings.update({
+        "window_size": self.get_size(),
+        "window_position": self.get_position(),
+        "window_splitter": self.input_splitter.get_position(),
+    })
+
+    if hasattr(self.stream_view, "splitter"):
+      self.model.settings["sidebar_splitter"] = self.stream_view.splitter.get_position()
+
+    self.model.settings["streams"] =  self.stream_view.get_state()
+    self.model.settings.save()
+
+  def on_pane_closed(self, widget, count):
+    if count < 2 and isinstance(self.stream_view, gwui.MultiStreamUi):
+      self.set_view("SingleStreamUi")
+
+  def on_window_close(self, *args):
+    self.save_window_settings()
+    gtk.main_quit()
+
+  def on_quit(self, *args):
+    self.service.Quit()
+    self.on_window_close()
+
+  def on_search(self, *args):
+    self.stream_view.set_state([{
+      "stream": "search",
+      "account": None,
+      "transient": False,
+    }])
+
+    self.stream_view.search_box.focus()
+
+  def on_perform_search(self, widget, query):
+    self.add_stream({
+      "name": query,
+      "query": query,
+    }, COUCH_TYPE_SEARCH)
+
+  def on_accounts(self, *args):
+    if os.path.exists(os.path.join("bin", "gwibber-accounts")):
+      cmd = os.path.join("bin", "gwibber-accounts")
+    else:
+      cmd = "gwibber-accounts"
+    return subprocess.Popen(cmd, shell=False)
+
+  def on_preferences(self, *args):
+    if os.path.exists(os.path.join("bin", "gwibber-preferences")):
+      cmd = os.path.join("bin", "gwibber-preferences")
+    else:
+      cmd = "gwibber-preferences"
+    return subprocess.Popen(cmd, shell=False)
+
+  def on_about(self, *args):
+    self.ui.add_from_file (resources.get_ui_asset("gwibber-about-dialog.ui"))
+    about_dialog = self.ui.get_object("about_dialog")
+    about_dialog.set_version(str(VERSION_NUMBER))
+    about_dialog.connect("response", lambda *a: about_dialog.hide())
+    about_dialog.show_all()
+
+  def on_close_stream(self, *args):
+    state = self.stream_view.get_state()
+    if state and state[0].get("transient", 0):
+      id = state[0]["transient"]
+      if self.model.streams.record_exists(id):
+        self.model.streams.delete_record(id)
+        self.stream_view.set_state([{"stream": "messages", "account": None}])
+
+  def on_message_action_menu(self, msg):
+    theme = gtk.icon_theme_get_default()
+    menu = gtk.Menu()
+    
+    for a in actions.MENU_ITEMS:
+      if a.include(self, msg):
+        image = gtk.image_new_from_icon_name(a.icon, gtk.ICON_SIZE_MENU)
+        mi = gtk.ImageMenuItem()
+        mi.set_label(a.label)
+        mi.set_image(image)
+        mi.set_property("use_underline", True)
+        mi.connect("activate", a.action, self, msg)
+        menu.append(mi)
+
+    menu.show_all()
+    menu.popup(None, None, None, 3, 0)
+
+  def on_action(self, widget, uri, cmd, query):
+    if hasattr(actions, cmd):
+      if "msg" in query:
+        query["msg"] = self.get_message(query["msg"])
+      getattr(actions, cmd).action(None, self, **query)
+
+  def on_stream_closed(self, widget, id, kind):
+    if self.model.streams.record_exists(id):
+      self.model.streams.delete_record(id)
+
+  def on_stream_changed(self, widget, stream):
+    self.update_menu_availability()
+
+  def on_input_changed(self, w, text, cnt):
+    self.input.textview.set_overlay_text(str(140 - cnt))
+
+  def on_input_activate(self, w, text, cnt):
+    self.send_message(text)
+    self.input.clear()
+
+  def on_button_send_clicked(self, w):
+    self.send_message(self.input.get_text())
+    self.input.clear()
+
+  def send_message(self, text):
+    target = self.message_target.target
+    action = self.message_target.action
+
+    if target:
+      if action == "reply":
+        data = {"message": text, "target": target}
+        self.service.Send(json.dumps(data))
+      elif action == "repost":
+        data = {"message": text, "accounts": [target["account"]]}
+        self.service.Send(json.dumps(data))
+      self.message_target.end()
+    else: self.service.SendMessage(text)
+  
+  def on_new_stream(self, *args):
+    if isinstance(self.stream_view, gwui.MultiStreamUi):
+      self.stream_view.new_stream()
+    else:
+      self.set_view("MultiStreamUi")
+      self.stream_view.new_stream()
+  
+  def on_loading_started(self, *args):
+    self.loading_spinner.set_from_animation(
+      gtk.gdk.PixbufAnimation(resources.get_ui_asset("progress.gif")))
+
+  def on_loading_complete(self, *args):
+    self.loading_spinner.clear()
+    self.update_view()
+
+  def on_connection_online(self, *args):
+    self.actions.get_action("refresh").set_sensitive(True)
+
+  def on_connection_offline(self, *args):
+    self.actions.get_action("refresh").set_sensitive(False)
+
+class Client(dbus.service.Object):
+  __dbus_object_path__ = "/com/GwibberClient"
+
+  def __init__(self):
+    # Setup a Client dbus interface
+    self.bus = dbus.SessionBus()
+    self.bus_name = dbus.service.BusName("com.GwibberClient", self.bus)
+    dbus.service.Object.__init__(self, self.bus_name, self.__dbus_object_path__)
+
+    # Methods the client exposes via dbus, return from the list method
+    self.exposed_methods = [
+                       'focus_client',
+                       'show_replies',
+                      ]
+
+    self.w = GwibberClient()
+
+  @dbus.service.method("com.GwibberClient", in_signature="", out_signature="")
+  def focus_client(self):
+    """
+    This method focuses the client UI displaying the default view.
+    Currently used when the client is activated via dbus activation.
+    """
+    self.w.present_with_time(int(time.mktime(datetime.datetime.now().timetuple())))
+    try:
+      self.w.move(*self.w.settings["window_position"])
+    except:
+      pass
+
+  @dbus.service.method("com.GwibberClient", in_signature="", out_signature="")
+  def show_replies(self):
+    """
+    This method focuses the client UI and displays the replies view.
+    Currently used when activated via the messaging indicator.
+    """
+    self.w.present_with_time(int(time.mktime(datetime.datetime.now().timetuple())))
+    self.w.move(*self.w.settings["window_position"])
+    # FIXME: we need to be able to select the stream to view
+    #self.w.account_tree.get_selection().unselect_all()
+    #self.w.account_tree.get_selection().select_path((2,))
+
+  @dbus.service.method("com.GwibberClient")
+  def list(self):
+    """
+    This method returns a list of exposed dbus methods
+    """
+    return self.exposed_methods

=== added file 'gwibber/gwui.py'
--- gwibber/gwui.py	1970-01-01 00:00:00 +0000
+++ gwibber/gwui.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,871 @@
+
+import os, json, urlparse, resources, util
+import gtk, gobject, pango, webkit, time, gconf
+
+import gettext
+from gettext import lgettext as _
+if hasattr(gettext, 'bind_textdomain_codeset'):
+    gettext.bind_textdomain_codeset('gwibber','UTF-8')
+gettext.textdomain('gwibber')
+
+from mako.template import Template
+from mako.lookup import TemplateLookup
+
+from microblog.util.const import *
+from microblog.util.couch import Monitor as CouchMonitor
+
+from desktopcouch.records.server import CouchDatabase
+from desktopcouch.records.record import Record as CouchRecord
+
+gtk.gdk.threads_init()
+
+if "gwibber" not in urlparse.uses_query:
+  urlparse.uses_query.append("gwibber")
+
+class Model(gobject.GObject):
+  __gsignals__ = {
+    "changed": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, ()),
+  }
+  def __init__(self):
+    gobject.GObject.__init__(self)
+
+    self.daemon = util.getbus("Service")
+    
+    self.account_monitor = util.getbus("Accounts")
+    self.account_monitor.connect_to_signal("AccountChanged", self.on_stream_changed)
+    self.account_monitor.connect_to_signal("AccountDeleted", self.on_stream_changed)
+    
+    self.streams_monitor = util.getbus("Streams")
+    self.streams_monitor.connect_to_signal("StreamChanged", self.on_stream_changed)
+    self.streams_monitor.connect_to_signal("StreamClosed", self.on_stream_changed)
+
+    self.settings = util.SettingsMonitor()
+    self.services = json.loads(self.daemon.GetServices())
+    self.features = json.loads(self.daemon.GetFeatures())
+    self.messages = CouchDatabase(COUCH_DB_MESSAGES, create=True)
+    self.accounts = CouchDatabase(COUCH_DB_ACCOUNTS, create=True)
+    self.streams = CouchDatabase(COUCH_DB_SETTINGS, create=True)
+
+    self.model = None
+    self.model_valid = False
+
+  def on_stream_changed(self, id):
+    self.model_valid = False
+    self.emit("changed")
+
+  @classmethod
+  def to_state(self, item):
+    if not item: return {}
+    return dict((x, item[x]) for x in ["transient", "account", "stream"])
+
+  @classmethod
+  def match(self, d1, d2):
+    return all(k in d1 and d1[k] == v for k, v in d2.items())
+
+  def find(self, **params):
+    for i in self.find_all(**params):
+      return i
+
+  def find_all(self, **params):
+    for stream in self.get_streams():
+      if self.match(stream, params): yield stream
+      
+      if "items" in stream:
+        for stream in stream["items"]:
+          if self.match(stream, params): yield stream
+
+  def get_streams(self):
+    if not self.model_valid: self.refresh()
+    return self.model
+
+  def refresh(self):
+    self.model = self.generate_streams()
+    self.model_valid = True
+
+  def generate_streams(self):
+    items = []
+    transients = self.streams.get_records(COUCH_TYPE_STREAM, True)
+
+    items.append({
+      "name": "Home",
+      "stream": "home",
+      "view": self.messages.execute_view("home", "messages")[[{}]:[0]],
+      "account": None,
+      "transient": False,
+      "color": None,
+    })
+
+    for stream in ["messages", "replies", "private"]:
+      items.append({
+        "name": stream.capitalize(),
+        "stream": stream,
+        "view": self.messages.execute_view("stream_time", "messages")[[stream, {}]:[stream, 0]],
+        "account": None,
+        "transient": False,
+        "color": None,
+      })
+
+    items.append({
+      "name": "Sent",
+      "stream": "sent",
+      "view": self.messages.execute_view("mine", "messages")[[{}]:[0]],
+      "account": None,
+      "transient": False,
+      "color": None,
+    })
+
+    for account in self.accounts.get_records(COUCH_TYPE_ACCOUNT, True):
+      account = account.value
+      aId = account["_id"]
+
+      item = {
+          "name": account.get("username", "None"),
+          "account": aId,
+          "stream": None,
+          "view": self.messages.execute_view("account_time", "messages")[[aId, {}]:[aId, 0]],
+          "transient": False,
+          "color": util.Color(account["color"]),
+          "protocol": account["protocol"],
+          "items": [],
+      }
+
+      default_streams = self.services[account["protocol"]]["default_streams"]
+      
+      if len(default_streams) > 1:
+        for feature in default_streams:
+          aname = self.features[feature]["stream"]
+          item["items"].append({
+            "name": aname.capitalize(),
+            "account": aId,
+            "stream": aname,
+            "view": self.messages.execute_view("account_stream_time", "messages")[[aId, aname, {}]:[aId, aname, 0]],
+            "transient": False,
+            "color": util.Color(account["color"]),
+            "protocol": account["protocol"],
+          })
+
+        item["items"].append({
+          "name": "Sent",
+          "account": aId,
+          "stream": "sent",
+          "view": self.messages.execute_view("mine_account", "messages")[[aId, {}]:[aId, 0]],
+          "transient": False,
+          "color": util.Color(account["color"]),
+          "protocol": account["protocol"],
+        })
+
+      for transient in transients:
+        transient = transient.value
+        tId = transient["_id"]
+
+        if transient["account"] == aId:
+          if transient["operation"] == "user_messages" and account["protocol"] in ["twitter", "identica"]:
+            uId = transient["parameters"]["id"]
+            view = self.messages.execute_view("user_protocol_time", "messages")[[uId, account["protocol"], {}]:[uId, account["protocol"], 0]]
+          else:
+            view = self.messages.execute_view("transient_time", "messages")[[tId, {}]:[tId, 0]],
+
+          item["items"].append({
+            "name": transient["name"],
+            "account": aId,
+            "stream": self.features[transient["operation"]]["stream"],
+            "view": view,
+            "transient": tId,
+            "color": util.Color(account["color"]),
+            "protocol": account["protocol"],
+          })
+      
+      items.append(item)
+
+    searches = {
+        "name": "Search",
+        "account": None,
+        "stream": "search",
+        "view": self.messages.execute_view("search_time", "messages")[{}:0],
+        "transient": False,
+        "color": None,
+        "items": [],
+    }
+
+    for search in self.streams.get_records(COUCH_TYPE_SEARCH, True):
+      search = search.value
+      sId = search["_id"]
+      searches["items"].append({
+        "name": search["name"],
+        "account": None, 
+        "view": self.messages.execute_view("transient_time", "messages")[[sId, {}]:[sId, 0]],
+        "stream": "search",
+        "transient": sId,
+        "color": None,
+      })
+      
+    items.append(searches)
+    return items
+
+class WebUi(webkit.WebView):
+  __gsignals__ = {
+    "action": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, str, object)),
+  }
+
+  def __init__(self):
+    webkit.WebView.__init__(self)
+    self.web_settings = webkit.WebSettings()
+    self.set_settings(self.web_settings)
+    self.gc = gconf.client_get_default()
+
+    self.connect("navigation-requested", self.on_click_link)
+    self.template = None
+
+  def on_click_link(self, view, frame, req):
+    uri = req.get_uri()
+    
+    if uri.startswith("file:///"): return False
+    elif uri.startswith("gwibber:"):
+      url = urlparse.urlparse(uri)
+      cmd = url.path.split("/")[1]
+      query = urlparse.parse_qs(url.query)
+      query = dict((x,y[0]) for x,y in query.items())
+      self.emit("action", uri, cmd, query)
+    else: util.load_url(uri) 
+    return True
+
+  def render(self, theme, template, **kwargs):
+    default_font = self.gc.get_string("/desktop/gnome/interface/font_name")
+    font_name, font_size = default_font.rsplit(None, 1)
+    self.web_settings.set_property("sans-serif-font-family", font_name)
+    self.web_settings.set_property("default-font-size", int(font_size))
+
+    if not resources.theme_exists(theme):
+      theme = "default"
+
+    theme_path = resources.get_theme_path(theme)
+    template_path = resources.get_template_path(template, theme)
+    lookup_paths = list(resources.get_template_dirs()) + [theme_path]
+    
+    template = open(template_path).read()
+    template = Template(template, lookup=TemplateLookup(directories=lookup_paths))
+    content = template.render(theme=util.get_theme_colors(), resources=resources, _=_, **kwargs)
+    
+    self.load_html_string(content, "file://%s/" % os.path.dirname(template_path))
+    return content
+
+class Navigation(WebUi):
+  __gsignals__ = {
+    "stream-selected": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (object,)),
+    "stream-closed": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, str)),
+  }
+
+  def __init__(self, model):
+    WebUi.__init__(self)
+
+    self.model = model
+    self.model.connect("changed", self.on_model_update)
+    self.connect("action", self.on_perform_action)
+
+    self.selected_stream = None
+    self.tree_enabled = False
+    self.small_icons = False
+    
+  def render(self):
+    return WebUi.render(self, self.model.settings["theme"], "navigation.mako",
+      streams=self.model.get_streams(),
+      tree=self.tree_enabled,
+      selected=self.selected_stream,
+      small_icons=self.small_icons)
+
+  def on_model_update(self, model):
+    self.render()
+
+  def on_perform_action(self, w, uri, cmd, query):
+    if cmd == "close" and "transient" in query:
+      self.emit("stream-closed", query["transient"], "transient")
+
+    if cmd == "stream":
+      query = dict((k, None if v == "None" else v) for k, v in query.items())
+      target = self.model.find(**query)
+      if target: self.emit("stream-selected", target)
+
+class SingleStreamUi(gtk.VBox):
+  __gsignals__ = {
+    "action": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, str, object)),
+    "stream-closed": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, str)),
+    "stream-changed": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (object,)),
+    "search": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str,)),
+  }
+  def __init__(self, model):
+    gtk.VBox.__init__(self)
+    self.model = model
+
+    # Build the side navigation bar
+    self.navigation = Navigation(self.model)
+    self.navigation.connect("stream-selected", self.on_stream_change)
+    self.navigation.connect("stream-closed", self.on_stream_closed)
+    self.navigation.render()
+
+    self.navigation_scroll = gtk.ScrolledWindow()
+    self.navigation_scroll.set_policy(gtk.POLICY_NEVER, gtk.POLICY_NEVER)
+    self.navigation_scroll.add(self.navigation)
+
+    # Build the main message view
+    self.message_view = MessageStreamView(self.model)
+    self.message_view.connect("action", self.on_action)
+
+    self.search_box = GwibberSearch()
+    self.search_box.connect("search", self.on_search)
+
+    self.message_scroll = gtk.ScrolledWindow()
+    self.message_scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+    self.message_scroll.set_shadow_type(gtk.SHADOW_IN)
+    self.message_scroll.add(self.message_view)
+
+    layout = gtk.VBox(spacing=5)
+    layout.pack_start(self.search_box, False)
+    layout.pack_start(self.message_scroll, True)
+
+    # Build the pane layout
+    self.splitter = gtk.HPaned()
+    self.splitter.add1(self.navigation_scroll)
+    self.splitter.add2(layout)
+    
+    self.splitter.set_position(self.model.settings["sidebar_splitter"])
+    self.handle_splitter_position_change(self.model.settings["sidebar_splitter"])
+    self.splitter.connect("notify", self.on_splitter_drag)
+
+    self.pack_start(self.splitter, True)
+
+  def handle_splitter_position_change(self, pos):
+    if pos < 70 and self.navigation.tree_enabled:
+      #self.navigation_scroll.set_policy(gtk.POLICY_NEVER, gtk.POLICY_NEVER)
+      self.navigation_scroll.set_shadow_type(gtk.SHADOW_NONE)
+      self.navigation.tree_enabled = False
+      self.navigation.render()
+
+    if pos > 70 and not self.navigation.tree_enabled:
+      #self.navigation_scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER)
+      self.navigation_scroll.set_shadow_type(gtk.SHADOW_IN)
+      self.navigation.tree_enabled = True
+      self.navigation.render()
+
+    if pos < 30 and not self.navigation.small_icons:
+      self.navigation.small_icons = True
+      self.navigation.render()
+
+    if pos > 30 and self.navigation.small_icons:
+      self.navigation.small_icons = False
+      self.navigation.render()
+
+    if pos < 25:
+      self.splitter.set_position(25)
+
+  def on_splitter_drag(self, pane, ev):
+    if ev.name == 'position':
+      pos = pane.get_position()
+      self.handle_splitter_position_change(pos)      
+      
+  def on_stream_closed(self, widget, id, kind):
+    self.emit("stream-closed", id, kind)
+
+  def on_stream_change(self, widget, stream):
+    self.navigation.selected_stream = stream
+    self.emit("stream-changed", stream)
+    self.update_search_visibility()
+    self.update()
+    
+  def update_search_visibility(self):
+    stream = self.navigation.selected_stream
+    if stream is not None:
+      is_search = stream["stream"] == "search" and stream["name"] == "Search"
+      self.search_box.set_visible(not is_search)
+
+  def on_action(self, widget, uri, cmd, query):
+    self.emit("action", uri, cmd, query)
+
+  def on_search(self, widget, query):
+    self.emit("search", query)
+
+  def update(self, *args):
+    if self.navigation.selected_stream:
+      self.message_view.render([self.navigation.selected_stream["view"]])
+
+  def get_state(self):
+    return [self.model.to_state(self.navigation.selected_stream)]
+
+  def new_stream(self, state=None):
+    if state: self.set_state([state])
+
+  def set_state(self, streams):
+    self.navigation.selected_stream = self.model.find(**streams[0])
+    self.navigation.render()
+    self.update_search_visibility()
+    self.update()
+
+
+class MultiStreamUi(gtk.HBox):
+  __gsignals__ = {
+    "action": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, str, object)),
+    "stream-closed": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, str)),
+    "stream-changed": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (object,)),
+    "pane-closed": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (int,)),
+    "search": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str,)),
+  }
+  def __init__(self, model):
+    gtk.HBox.__init__(self)
+    self.model = model
+
+    self.container = gtk.HBox(spacing=5)
+    self.container.set_border_width(5)
+
+    self.scroll = gtk.ScrolledWindow()
+    self.scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER)
+    self.scroll.add_with_viewport(self.container)
+
+    self.pack_start(self.scroll, True)
+  
+  def on_stream_closed(self, widget, id, kind):
+    self.emit("stream-closed", id, kind)
+
+  def on_pane_closed(self, widget):
+    widget.destroy()
+    self.emit("pane-closed", len(self.container))
+    
+  def on_search(self, widget, query):
+    self.emit("search", query)
+
+  def on_action(self, widget, uri, cmd, query):
+    self.emit("action", uri, cmd, query)
+
+  def new_stream(self, state=None):
+    item = MultiStreamPane(self.model)
+    item.set_property("width-request", 350)
+    item.connect("search", self.on_search)
+    item.connect("action", self.on_action)
+    item.connect("stream-closed", self.on_stream_closed)
+    item.connect("pane-closed", self.on_pane_closed)
+    item.show_all()
+
+    item.search_box.hide()
+    if state: item.set_state(state)
+    self.container.pack_start(item)
+    return item
+
+  def set_state(self, state):
+    for item in self.container: item.destroy()
+    for item in state: self.new_stream(item)
+
+  def get_state(self):
+    return [pane.get_state() for pane in self.container]
+
+  def update(self):
+    for stream in self.container:
+      stream.update()
+
+class MultiStreamPane(gtk.VBox):
+  __gsignals__ = {
+    "action": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, str, object)),
+    "stream-closed": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, str)),
+    "pane-closed": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, ()),
+    "search": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str,)),
+  }
+
+  def __init__(self, model):
+    gtk.VBox.__init__(self, spacing = 2)
+    self.model = Model()
+    self.selected_stream = None
+
+    # Build the top navigation bar
+    close_icon = gtk.image_new_from_stock("gtk-close", gtk.ICON_SIZE_MENU)
+    down_arrow = gtk.Arrow(gtk.ARROW_DOWN, gtk.SHADOW_NONE)
+    
+    btn_arrow = gtk.Button()
+    btn_arrow.set_relief(gtk.RELIEF_NONE)
+    btn_arrow.add(down_arrow)
+    btn_arrow.connect("clicked", self.on_dropdown)
+
+    self.arrow = gtk.EventBox()
+    self.arrow.add(btn_arrow)
+
+    btn_close = gtk.Button()
+    btn_close.set_relief(gtk.RELIEF_NONE)
+    btn_close.set_image(close_icon)
+    btn_close.connect("clicked", self.on_close)
+
+    self.icon_protocol = gtk.Image()
+    self.icon_stream = gtk.Image()
+    self.nav_label = gtk.Label()
+
+    self.search_box = GwibberSearch()
+    self.search_box.connect("search", self.on_search)
+
+    self.navigation_bar = gtk.HBox(spacing=5)
+    self.navigation_bar.pack_start(self.arrow, False)
+    self.navigation_bar.pack_start(self.icon_protocol, False)
+    self.navigation_bar.pack_start(self.icon_stream, False)
+    self.navigation_bar.pack_start(self.nav_label, False)
+    self.navigation_bar.pack_end(btn_close, False)
+
+    # Build the main message view
+    self.message_view = MessageStreamView(self.model)
+    self.message_view.connect("action", self.on_action)
+    
+    self.message_scroll = gtk.ScrolledWindow()
+    self.message_scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+    self.message_scroll.set_shadow_type(gtk.SHADOW_IN)
+    self.message_scroll.add(self.message_view)
+
+    self.pack_start(self.navigation_bar, False)
+    self.pack_start(self.search_box, False)
+    self.pack_start(self.message_scroll, True)
+
+  def on_close(self, *args):
+    self.emit("pane-closed")
+
+  def on_dropdown(self, button):
+    w, h = self.arrow.window.get_geometry()[2:4]
+    x, y = self.arrow.window.get_origin()
+    
+    window = gtk.Window()
+    window.move(x, y + h)
+    window.set_decorated(False)
+    window.set_property("skip-taskbar-hint", True)
+    window.set_property("skip-pager-hint", True)
+    window.set_events(gtk.gdk.FOCUS_CHANGE_MASK)
+    window.connect("focus-out-event", lambda w,x: w.destroy())
+
+    def on_change(widget, stream):
+      self.set_stream(stream)
+      self.update()
+      window.destroy()
+
+    def on_stream_close(widget, id, kind):
+      self.emit("stream-closed", id, kind)
+
+    navigation = Navigation(self.model)
+    navigation.connect("stream-selected", on_change)
+    navigation.connect("stream-closed", on_stream_close)
+    navigation.selected_stream = self.selected_stream
+    navigation.tree_enabled = True
+    navigation.small_icons = True
+    navigation.render()
+
+    window.add(navigation)
+    window.show_all()
+    window.grab_focus()
+
+  def set_stream(self, stream):
+    self.selected_stream = stream
+    self.nav_label.set_text(stream["name"])
+
+    is_search = stream["stream"] == "search" and stream["name"] == "Search"
+    self.search_box.set_visible(not is_search)
+    
+    if stream["account"]:
+      fname = resources.get_ui_asset("icons/breakdance/16x16/%s.png" % stream["protocol"])
+      self.icon_protocol.set_from_file(fname)
+    else: self.icon_protocol.clear()
+
+    if stream["stream"]:
+      fname = resources.get_ui_asset("icons/streams/16x16/%s.png" % stream["stream"])
+      self.icon_stream.set_from_file(fname)
+    else: self.icon_stream.clear()
+
+  def on_search(self, widget, query):
+    self.emit("search", query)
+
+  def on_action(self, widget, uri, cmd, query):
+    self.emit("action", uri, cmd, query)
+
+  def update(self, *args):
+    if self.selected_stream:
+      self.message_view.render([self.selected_stream["view"]])
+
+  def get_state(self):
+    return self.model.to_state(self.selected_stream)
+
+  def set_state(self, stream):
+    self.set_stream(self.model.find(**stream))
+    self.update()
+
+class AccountTargetBar(gtk.HBox):
+  __gsignals__ = {
+      "canceled": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, ())
+  }
+
+  def __init__(self, model):
+    gtk.HBox.__init__(self, spacing=5)
+    self.model = model
+    self.model.connect("changed", self.on_account_changed)
+    self.accounts = []
+    
+    self.target = None
+    self.action = None
+    
+    self.targetbar = WebUi()
+    self.targetbar.connect("action", self.on_action)
+    self.targetbar.set_size_request(0, 24)
+    self.pack_start(self.targetbar, True)
+
+    self.populate()
+    self.render()
+
+  def set_target(self, message, action="reply"):
+    self.target = message
+    self.target["account_data"] = dict(self.model.accounts.get_record(message["account"]).items())
+    self.action = action
+    self.render()
+
+  def end(self):
+    self.emit("canceled")
+    self.target = None
+    self.action = None
+    self.render()
+
+  def on_action(self, w, uri, cmd, query):
+    if cmd == "cancel": return self.end()
+    if cmd == "account" and "id" in query and \
+        self.model.accounts.record_exists(query["id"]):
+
+      if "send_enabled" in query:
+        self.model.accounts.update_fields(query["id"],
+            {"send_enabled": bool(query["send_enabled"] == "true")})
+
+  def on_account_changed(self, id):
+    self.populate()
+    self.render()
+
+  def populate(self):
+    self.accounts = []
+    for account in self.model.accounts.get_records(COUCH_TYPE_ACCOUNT, True):
+      if "send" in self.model.services[account.value["protocol"]]["features"]:
+        self.accounts.append(account.value)
+
+  def render(self):
+    return self.targetbar.render(self.model.settings["theme"], "targetbar.mako",
+        services=self.model.services,
+        target=self.target,
+        action=self.action,
+        accounts=self.accounts)
+
+class MessageStreamView(WebUi):
+  def __init__(self, model):
+    WebUi.__init__(self)
+    self.model = model
+
+  def render(self, views):
+    accounts = CouchDatabase(COUCH_DB_ACCOUNTS).get_records(COUCH_TYPE_ACCOUNT, True)
+    
+    accounts = dict((a.id, a.value) for a in accounts)
+    messages = []
+    seen = {}
+    
+    for view in views:
+      view.options["descending"] = True
+      view.options["limit"] = 100
+      view._fetch()
+
+      for item in view:
+        message = item.value
+        message["dupes"] = []
+        message["txtid"] = util.remove_urls(message["text"]).strip()[:140] or None
+        message["color"] = util.Color(accounts.get(message["account"], {"color": "#5A5A5A"})["color"])
+        message["time_string"] = util.generate_time_string(message["time"])
+        messages.append(message)
+
+    def dupematch(item, message):
+      if item["protocol"] == message["protocol"] and item["id"] == message["id"]:
+        return True
+
+      for item in item["dupes"]:
+        if item["protocol"] == message["protocol"] and item["id"] == message["id"]:
+          return True
+
+    # Detect duplicates
+    for n, message in enumerate(messages):
+      message["is_dupe"] = message["txtid"] in seen
+      if message["is_dupe"]:
+        item = messages[seen[message["txtid"]]]
+        if not dupematch(item, message):
+          item["dupes"].append(message)
+      else:
+        if message["txtid"]:
+          seen[message["txtid"]] = n
+    
+    WebUi.render(self, self.model.settings["theme"], "template.mako", 
+        message_store=messages,
+        preferences=self.model.settings,
+        services=self.model.services,
+        accounts=accounts)
+
+class GwibberSearch(gtk.HBox):
+  __gsignals__ = {
+    "search": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str,)),
+  }
+
+  def __init__(self):
+    gtk.HBox.__init__(self, spacing=2)
+    
+    self.entry = gtk.Entry()
+    self.entry.connect("activate", self.on_search)
+    self.entry.connect("changed", self.on_changed)
+
+    self.button = gtk.Button("Search")
+    self.button.connect("clicked", self.on_search)
+    
+    self.pack_start(self.entry, True)
+    self.pack_start(self.button, False)
+
+    try:
+      self.entry.set_property("primary-icon-stock", gtk.STOCK_FIND)
+      self.entry.connect("icon-press", self.on_icon_press)
+    except: pass
+
+  def on_search(self, *args):
+    self.emit("search", self.entry.get_text())
+    self.clear()
+    
+  def clear(self):
+    self.entry.set_text("")
+
+  def on_icon_press(self, w, pos, e):
+    if pos == 1: return self.clear()
+
+  def on_changed(self, widget):
+    self.entry.set_property("secondary-icon-stock",
+      gtk.STOCK_CLEAR if self.entry.get_text().strip() else None)
+
+  def set_visible(self, value):
+    if value: self.hide()
+    else: self.show_all()
+
+  def focus(self):
+    self.entry.grab_focus()
+    
+class Input(gtk.Frame):
+  __gsignals__ = {
+    "submit": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, int)),
+    "changed": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, (str, int))
+  }
+
+  def __init__(self):
+    gtk.Frame.__init__(self)
+
+    self.textview = InputTextView()
+    self.textview.connect("submit", self.do_submit_event)
+    self.textview.get_buffer().connect("changed", self.do_changed_event)
+
+    scroll = gtk.ScrolledWindow()
+    scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+    scroll.add(self.textview)
+    self.add(scroll)
+
+  def get_text(self):
+    return self.textview.get_text()
+
+  def set_text(self, t):
+    self.textview.get_buffer().set_text(t)
+
+  def clear(self):
+    self.set_text("")
+
+  def do_changed_event(self, tb):
+    text = self.textview.get_text()
+    chars = self.textview.get_char_count()
+    self.emit("changed", text, chars)
+  
+  def do_submit_event(self, tv):
+    text = tv.get_text()
+    chars = tv.get_char_count()
+    self.emit("submit", text, chars)
+
+class InputTextView(gtk.TextView):
+  __gsignals__ = {
+    "submit": (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, ())
+  }
+
+  def __init__(self):
+    gtk.TextView.__init__(self)
+    self.drawable = None
+
+    self.model = Model()
+
+    self.overlay_color = util.get_theme_colors()["text"].darker(3).hex
+    self.overlay_text = '<span weight="bold" size="xx-large" foreground="%s">%s</span>'
+    
+    self.shortener = util.getbus("URLShorten")
+
+    self.connection = util.getbus("Connection")
+    self.connection.connect_to_signal("ConnectionOnline", self.on_connection_online)
+    self.connection.connect_to_signal("ConnectionOffline", self.on_connection_offline)
+    
+    self.get_buffer().connect("insert-text", self.on_add_text)
+    self.get_buffer().connect("changed", self.on_text_changed)
+    self.connect("expose-event", self.expose_view)
+
+    # set properties
+    self.set_border_width(0)
+    self.set_accepts_tab(True)
+    self.set_editable(True)
+    self.set_cursor_visible(True)
+    self.set_wrap_mode(gtk.WRAP_WORD_CHAR)
+    self.set_left_margin(2)
+    self.set_right_margin(2)
+    self.set_pixels_above_lines(2)
+    self.set_pixels_below_lines(2)
+    
+    self.base_color = util.get_style().base[gtk.STATE_NORMAL]
+    self.error_color = gtk.gdk.color_parse("indianred")
+
+    # set state online/offline
+    if not self.connection.isConnected():
+      self.set_sensitive(False)
+
+    if util.gtkspell:
+      try:
+        self.spell = util.gtkspell.Spell(self, None)
+      except:
+        pass
+
+  def get_text(self):
+    buf = self.get_buffer()
+    return buf.get_text(*buf.get_bounds()).strip()
+
+  def get_char_count(self):
+    return len(unicode(self.get_text(), "utf-8"))
+
+  def on_add_text(self, buf, iter, text, tlen):
+    if self.model.settings["shorten_urls"]:
+      if text and text.startswith("http") and not " " in text \
+          and len(text) > 30:
+
+        buf = self.get_buffer()
+        buf.stop_emission("insert-text")
+        service = self.model.settings["urlshorter"] or "is.gd"
+        short = self.shortener.Shorten(text, service)
+        buf.insert(iter, short)
+
+  def set_overlay_text(self, text):
+    self.pango_overlay.set_markup(self.overlay_text % (self.overlay_color, text))
+
+  def expose_view(self, window, event):
+    if not self.drawable:
+      self.drawable = self.get_window(gtk.TEXT_WINDOW_TEXT)
+      self.pango_overlay = self.create_pango_layout("")
+      self.set_overlay_text(140)
+      
+    gc = self.drawable.new_gc()
+    ww, wh = self.drawable.get_size()
+    tw, th = self.pango_overlay.get_pixel_size()
+    self.drawable.draw_layout(gc, ww - tw, wh - th, self.pango_overlay)
+
+  def on_text_changed(self, w):
+    chars = self.get_char_count()
+    color = self.error_color if chars > 140 else self.base_color
+    self.modify_base(gtk.STATE_NORMAL, color)
+
+  def on_connection_online(self, w):
+    self.set_sensitive(True)
+
+  def on_connection_offline(self, w):
+    self.set_sensitive(False)
+
+gtk.binding_entry_add_signal(InputTextView, gtk.keysyms.Return, 0, "submit")
+gtk.binding_entry_add_signal(InputTextView, gtk.keysyms.KP_Enter, 0, "submit")

=== added directory 'gwibber/lib'
=== added file 'gwibber/lib/__init__.py'
--- gwibber/lib/__init__.py	1970-01-01 00:00:00 +0000
+++ gwibber/lib/__init__.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,34 @@
+import dbus
+from gwibber import util
+
+class GwibberPublic:
+
+  def __init__(self):
+    bus = dbus.SessionBus()
+    self.service = util.getbus("Service")
+    self.accounts_monitor = util.getbus("Accounts")
+
+  def post(self, message):
+    args = [message]
+    self.microblog.operation({
+      "args": args,
+      "opname": "send",
+      })
+
+  def GetServices(self):
+    return self.service.GetServices()
+
+  def GetAccounts(self):
+    return self.service.GetAccounts()
+
+  def SendMessage(self, message):
+    return self.service.SendMessage(message)
+
+  def Refresh(self):
+    return self.service.Refresh()
+
+  def MonitorAccountChanged(self, cb):
+    self.accounts_monitor.connect_to_signal("AccountChanged", cb)
+
+  def MonitorAccountDeleted(self, cb):
+    self.accounts_monitor.connect_to_signal("AccountDeleted", cb)

=== added directory 'gwibber/lib/gtk'
=== added file 'gwibber/lib/gtk/__init__.py'
--- gwibber/lib/gtk/__init__.py	1970-01-01 00:00:00 +0000
+++ gwibber/lib/gtk/__init__.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,1 @@
+__all__ = ["twitter", "identica", "flickr", "facebook", "friendfeed"]

=== added file 'gwibber/lib/gtk/facebook.py'
--- gwibber/lib/gtk/facebook.py	1970-01-01 00:00:00 +0000
+++ gwibber/lib/gtk/facebook.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,110 @@
+#
+# Copyright (C) 2010 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 <[e-mail]>
+#
+# facebook widgets for Gwibber
+#
+
+import gtk
+import urllib
+import webkit
+from gtk import Builder
+import gwibber.microblog
+from gwibber.microblog import facebook
+from gwibber.microblog.support import facelib
+import json, urlparse
+
+APP_KEY = "71b85c6d8cb5bbb9f1a3f8bbdcdd4b05"
+
+class AccountWidget(gtk.VBox):
+  """AccountWidget: A widget that provides a user interface for configuring facebook accounts in Gwibber
+  """
+  
+  def __init__(self, account=None):
+    """Creates the account pane for configuring facebook accounts"""
+    gtk.VBox.__init__( self, False, 20 )
+    self.ui = gtk.Builder()
+    self.ui.add_from_file (gwibber.resources.get_ui_asset("gwibber-accounts-facebook.ui"))
+    self.ui.connect_signals(self)
+    self.vbox_settings = self.ui.get_object("vbox_settings")
+    self.pack_start(self.vbox_settings, False, False)
+    self.vbox_settings.show_all()
+    if account:
+      self.account = account
+    else:
+      self.account = {}
+    try:
+      if self.account["session_key"] and self.account["secret_key"] and self.account["username"]:
+        self.ui.get_object("hbox_facebook_auth").hide()
+        self.ui.get_object("fb_auth_done_label").set_label(str(self.account["username"]) + " has been authorized by Facebook")
+        self.ui.get_object("hbox_facebook_auth_done").show()
+    except:
+      self.ui.get_object("hbox_facebook_auth_done").hide()
+
+  def on_facebook_auth_clicked(self, widget, data=None):
+    (self.win_w, self.win_h) = self.window.get_size()
+
+    web = webkit.WebView()
+    web.load_html_string("<p>Please wait...</p>", "file:///")
+
+    url = urllib.urlencode({
+      "api_key": "71b85c6d8cb5bbb9f1a3f8bbdcdd4b05",
+      "connect_display": "popup",
+      "v": "1.0",
+      "next": "http://www.facebook.com/connect/login_success.html",
+      "cancel_url": "http://www.facebook.com/connect/login_failure.html",
+      "fbconnect": "true",
+      "return_session": "true",
+      "req_perms": "publish_stream,read_stream,status_update,offline_access"
+    })
+    web.set_size_request(450, 340)
+    web.open("http://www.facebook.com/login.php?" + url)
+    web.connect("title-changed", self.on_facebook_auth_title_change)
+    self.pack_start(web, True, True, 0)
+    self.show_all()
+    self.ui.get_object("vbox1").hide()
+    self.ui.get_object("expander1").hide()
+
+  def on_facebook_auth_title_change(self, web=None, title=None, data=None):
+    if title.get_title() == "Success":
+      try:
+        url = web.get_main_frame().get_uri()
+        data = json.loads(urlparse.parse_qs(url.split("?", 1)[1])["session"][0])
+        self.account["session_key"] = str(data["session_key"])
+        self.account["secret_key"] = str(data["secret"])
+        fbuid = self.account["session_key"].split("-")[1]
+        fbc = facelib.Facebook(APP_KEY, "")
+        fbc.session_key = self.account["session_key"]
+        fbc.secret_key = self.account["secret_key"]
+        self.account["username"] = str(fbc.users.getInfo(fbuid)[0]["name"])
+        self.ui.get_object("hbox_facebook_auth").hide()
+        self.ui.get_object("fb_auth_done_label").set_label(str(self.account["username"]) + " has been authorized by Facebook")
+        self.ui.get_object("hbox_facebook_auth_done").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()
+
+    if title.get_title() == "Failure":
+      d = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR,
+        gtk.BUTTONS_OK, "Facebook authorization failed. Please try again.")
+      if d.run(): d.destroy()
+
+      web.hide()
+      self.window.resize(self.win_w, self.win_h)

=== added file 'gwibber/lib/gtk/flickr.py'
--- gwibber/lib/gtk/flickr.py	1970-01-01 00:00:00 +0000
+++ gwibber/lib/gtk/flickr.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2010 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 <[e-mail]>
+#
+# Flickr widgets for Gwibber
+#
+
+import gtk
+from gtk import Builder
+import gwibber.resources
+
+class AccountWidget(gtk.VBox):
+  """AccountWidget: A widget that provides a user interface for configuring flickr accounts in Gwibber
+  """
+  
+  def __init__(self, account=None):
+    """Creates the account pane for configuring flickr accounts"""
+    gtk.VBox.__init__( self, False, 20 )
+    self.ui = gtk.Builder()
+    self.ui.add_from_file (gwibber.resources.get_ui_asset("gwibber-accounts-flickr.ui"))
+    self.ui.connect_signals(self)
+    self.vbox_settings = self.ui.get_object("vbox_settings")
+    self.pack_start(self.vbox_settings, False, False)
+    self.vbox_settings.show_all()
+    

=== added file 'gwibber/lib/gtk/friendfeed.py'
--- gwibber/lib/gtk/friendfeed.py	1970-01-01 00:00:00 +0000
+++ gwibber/lib/gtk/friendfeed.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2010 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 <[e-mail]>
+#
+# FriendFeed widgets for Gwibber
+#
+
+import gtk
+from gtk import Builder
+import gwibber.microblog
+
+class AccountWidget(gtk.VBox):
+  """AccountWidget: A widget that provides a user interface for configuring friendfeed accounts in Gwibber
+  """
+  
+  def __init__(self, account=None):
+    """Creates the account pane for configuring friendfeed accounts"""
+    gtk.VBox.__init__( self, False, 20 )
+    self.ui = gtk.Builder()
+    self.ui.add_from_file (gwibber.resources.get_ui_asset("gwibber-accounts-friendfeed.ui"))
+    self.ui.connect_signals(self)
+    self.vbox_settings = self.ui.get_object("vbox_settings")
+    self.pack_start(self.vbox_settings, False, False)
+    self.vbox_settings.show_all()
+    

=== added file 'gwibber/lib/gtk/identica.py'
--- gwibber/lib/gtk/identica.py	1970-01-01 00:00:00 +0000
+++ gwibber/lib/gtk/identica.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2010 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 <[e-mail]>
+#
+# Identi.ca widgets for Gwibber
+#
+
+import gtk
+from gtk import Builder
+import gwibber.microblog
+
+class AccountWidget(gtk.VBox):
+  """AccountWidget: A widget that provides a user interface for configuring identica accounts in Gwibber
+  """
+  
+  def __init__(self, account=None):
+    """Creates the account pane for configuring identica accounts"""
+    gtk.VBox.__init__( self, False, 20 )
+    self.ui = gtk.Builder()
+    self.ui.add_from_file (gwibber.resources.get_ui_asset("gwibber-accounts-identica.ui"))
+    self.ui.connect_signals(self)
+    self.vbox_settings = self.ui.get_object("vbox_settings")
+    self.pack_start(self.vbox_settings, False, False)
+    self.vbox_settings.show_all()
+    

=== added file 'gwibber/lib/gtk/twitter.py'
--- gwibber/lib/gtk/twitter.py	1970-01-01 00:00:00 +0000
+++ gwibber/lib/gtk/twitter.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,76 @@
+#
+# Copyright (C) 2010 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 <[e-mail]>
+#
+# Twitter widgets for Gwibber
+#
+
+import gtk
+from gtk import Builder
+import gwibber.microblog
+
+class AccountWidget(gtk.VBox):
+  """AccountWidget: A widget that provides a user interface for configuring twitter accounts in Gwibber
+  """
+  
+  def __init__(self, account=None):
+    """Creates the account pane for configuring twitter accounts"""
+    gtk.VBox.__init__( self, False, 20 )
+    self.ui = gtk.Builder()
+    self.ui.add_from_file (gwibber.resources.get_ui_asset("gwibber-accounts-twitter.ui"))
+    self.ui.connect_signals(self)
+    self.vbox_settings = self.ui.get_object("vbox_settings")
+    self.pack_start(self.vbox_settings, False, False)
+    self.vbox_settings.show_all()
+    
+"""
+    gtk.VBox.__init__( self, False, 20 )
+    username_box = gtk.HBox(False,2)
+    self.pack_start(username_box, False, False)
+    username_label = gtk.Label("Username:")
+    username_box.pack_start(username_label, False, False)
+    username_entry = gtk.Entry()
+    username_box.pack_start(username_entry, False, False)
+    username_box.show_all()
+
+    password_box = gtk.HBox(False,2)
+    self.pack_start(password_box, False, False)
+    password_label = gtk.Label("Password:")
+    password_box.pack_start(password_label, False, False)
+    password_entry = gtk.Entry()
+    password_entry.set_visibility(False)
+    password_box.pack_start(password_entry, False, False)
+    password_box.show_all()
+
+    button_box = gtk.HButtonBox()
+    button_box.set_border_width(5)
+    button_box.set_layout(gtk.BUTTONBOX_END)
+    button_box.set_spacing(0)
+    cancel_button = gtk.Button(stock='gtk-cancel')
+    button_box.add(cancel_button)
+    cancel_button.connect("clicked", self.on_cancel_clicked)
+    save_button = gtk.Button(stock='gtk-save')
+    button_box.add(save_button)
+    save_button.connect("clicked", self.on_save_clicked)
+    self.pack_end(button_box, False, False)
+    button_box.show_all()
+
+  def on_cancel_clicked(elf, widget, data=None):
+    print "on_cancel_clicked"
+  
+  def on_save_clicked(elf, widget, data=None):
+    print "on_save_clicked"
+"""

=== added file 'gwibber/lib/gtk/widgets.py'
--- gwibber/lib/gtk/widgets.py	1970-01-01 00:00:00 +0000
+++ gwibber/lib/gtk/widgets.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,65 @@
+#
+# Copyright (C) 2010 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 <[e-mail]>
+#
+# widgets for Gwibber
+#
+
+from dbus.mainloop.glib import DBusGMainLoop
+import gobject, gtk
+import gwibber.gwui, gwibber.util, gwibber.resources
+import gettext
+from gettext import lgettext as _
+if hasattr(gettext, 'bind_textdomain_codeset'):
+    gettext.bind_textdomain_codeset('gwibber','UTF-8')
+gettext.textdomain('gwibber')
+
+class GwibberPosterVBox(gtk.VBox):
+  def __init__(self):
+    gtk.VBox.__init__(self)
+    DBusGMainLoop(set_as_default=True)
+    loop = gobject.MainLoop()
+    self.service = gwibber.util.getbus("Service")
+    self.stream_model = gwibber.gwui.Model()
+
+    self.input = gwibber.gwui.Input()
+    self.input.connect("submit", self.on_input_activate)
+    self.input.connect("changed", self.on_input_changed)
+    self.input_splitter = gtk.VPaned()
+    self.input_splitter.add1(self.input)
+
+    self.button_send = gtk.Button(_("Send"))
+    self.button_send.connect("clicked", self.on_input_activate)
+    self.message_target = gwibber.gwui.AccountTargetBar(self.stream_model)
+    self.message_target.pack_end(self.button_send, False)
+
+    content = gtk.VBox(spacing=5)
+    content.pack_start(self.input_splitter, True)
+    content.pack_start(self.message_target, False)
+    content.set_border_width(5)
+
+    layout = gtk.VBox()
+    layout.pack_start(content, True)
+    self.add(layout)
+
+  def on_input_changed(self, w, text, cnt):
+    self.input.textview.set_overlay_text(str(140 - cnt))
+
+  def on_input_activate(self, w, text, cnt):
+    self.service.SendMessage(text)
+    w.clear()
+
+

=== added directory 'gwibber/microblog'
=== added file 'gwibber/microblog/__init__.py'
=== added file 'gwibber/microblog/brightkite.py'
--- gwibber/microblog/brightkite.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/brightkite.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,177 @@
+"""
+
+BrightKite interface for Gwibber
+SegPhault (Ryan Paul) - 10/19/2008
+
+"""
+
+from . import support
+import urllib2, urllib, base64, re, simplejson
+from xml.dom import minidom
+
+PROTOCOL_INFO = {
+  "name": "BrightKite",
+  "version": 0.2,
+  
+  "config": [
+    "password",
+    "username",
+    "message_color",
+    "receive_enabled",
+    "send_enabled"
+  ],
+
+  "features": [
+    "receive",
+    "responses",
+    "thread",
+  ],
+}
+
+NICK_PARSE = re.compile("@([A-Za-z0-9]+)")
+
+class Message:
+  def __init__(self, client, data):
+    self.client = client
+    self.account = client.account
+    self.protocol = client.account["protocol"]
+    self.username = client.account["username"]
+
+    self.sender = data["creator"]["fullname"]
+    self.sender_nick = data["creator"]["login"]
+    self.sender_id = data["creator"]["login"]
+    self.image = data["creator"]["small_avatar_url"]
+    
+    self.time = support.parse_time(data["created_at"])
+    self.text = data["body"] or ""
+    self.bgcolor = "message_color"
+    self.id = data["id"]
+    
+    self.url = "http://brightkite.com/objects/%s" % data["id"]
+    self.profile_url = "http://brightkite.com/people/%s" % self.sender_nick
+    
+    self.html_string = '<span class="text">%s</span>' % \
+      NICK_PARSE.sub('@<a class="inlinenick" href="http://brightkite.com/people/\\1">\\1</a>',
+        support.linkify(self.text))
+    
+    self.is_reply = ("@%s" % self.username) in self.text
+    self.can_thread = data["comments_count"] > 0
+
+    # Geolocation
+    self.location_lon = data["place"]["longitude"]
+    self.location_lat = data["place"]["latitude"]
+    self.location_id = data["place"]["id"]
+    self.location_name = data["place"]["name"]
+    self.location_fullname = data["place"]["display_location"]
+    self.geo_position = (self.location_lat, self.location_lon)
+
+    if "photo" in data:
+      self.thumbnails = [{"src": data["photo"], "href": data["photo"]}]
+
+class Comment:
+  def __init__(self, client, data):
+    self.client = client
+    self.account = client.account
+    self.protocol = client.account["protocol"]
+    self.username = client.account["username"]
+
+    self.sender = data["user"]["fullname"]
+    self.sender_nick = data["user"]["login"]
+    self.sender_id = data["user"]["login"]
+    self.image = data["user"]["small_avatar_url"]
+    
+    self.time = support.parse_time(data["created_at"])
+    self.text = data["comment"]
+    self.bgcolor = "message_color"
+    
+    self.url = "http://brightkite.com/objects/%s" % data["place_object"]["id"]
+    self.profile_url = "http://brightkite.com/people/%s" % self.sender_nick
+    
+    self.html_string = '<span class="text">%s</span>' % \
+      NICK_PARSE.sub('@<a class="inlinenick" href="http://brightkite.com/people/\\1">\\1</a>',
+        support.linkify(self.text))
+    
+    self.is_reply = ("@%s" % self.username) in self.text
+
+class FriendPosition:
+  def __init__(self, client, data):
+    self.client = client
+    self.account = client.account
+    self.protocol = client.account["protocol"]
+    self.username = client.account["username"]
+    self.sender = data["fullname"]
+    self.sender_nick = data["login"]
+    self.sender_id = self.sender_nick
+    self.time = support.parse_time(data["last_checked_in"])
+    self.text = data["place"]["display_location"]
+    self.image = data["small_avatar_url"]
+    self.image_small = data["smaller_avatar_url"]
+    self.bgcolor = "message_color"
+    self.url = "http://brightkite.com" # TODO
+    self.profile_url = "http://brightkite.com" # TODO
+    self.is_reply = False
+
+    # Geolocation
+    self.location_lon = data["place"]["longitude"]
+    self.location_lat = data["place"]["latitude"]
+    self.location_id = data["place"]["id"]
+    self.location_name = data["place"]["name"]
+    self.location_fullname = data["place"]["display_location"]
+
+class Client:
+  def __init__(self, acct):
+    self.account = acct
+
+  def get_auth(self):
+    return "Basic %s" % base64.encodestring(
+      ("%s:%s" % (self.account["username"], self.account["password"]))).strip()
+
+  def connect(self, url, data = None):
+    return urllib2.urlopen(urllib2.Request(
+      url, data, {"Authorization": self.get_auth()}))
+
+  def get_friend_positions(self):
+    return simplejson.load(self.connect(
+      "http://brightkite.com/me/friends.json"))
+
+  def get_messages(self):
+    return simplejson.load(self.connect(
+      "http://brightkite.com/me/friendstream.json"))
+
+  def get_responses(self):
+    return simplejson.load(self.connect(
+      "http://brightkite.com/me/mentionsstream.json"))
+
+  def get_thread_data(self, msg):
+    return simplejson.load(self.connect(
+      "http://brightkite.com/objects/%s/comments.json" % msg.id))
+
+  def get_search(self, query):
+    return minidom.parseString(urllib2.urlopen(
+      urllib2.Request("http://identi.ca/search/notice/rss",
+        urllib.urlencode({"q": query}))).read()).getElementsByTagName("item")
+
+  def thread(self, msg):
+    yield msg
+    for data in self.get_thread_data(msg):
+      yield Comment(self, data)
+
+  def friend_positions(self):
+    for data in self.get_friend_positions():
+      yield FriendPosition(self, data)
+
+  def search(self, query):
+    for data in self.get_search(query):
+      yield SearchResult(self, data, query)
+
+  def responses(self):
+    for data in self.get_responses():
+      yield Message(self, data)
+
+  def receive(self):
+    for data in self.get_messages():
+      yield Message(self, data)
+
+  def send(self, message):
+    return self.connect("http://identi.ca/api/statuses/update.json",
+        urllib.urlencode({"status":message}))

=== added file 'gwibber/microblog/can.py'
--- gwibber/microblog/can.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/can.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,23 @@
+
+"""
+
+Microblog feature index
+
+"""
+
+SEND = 0
+RECEIVE = 1
+SEARCH = 2
+REPLY = 3
+RESPONSES = 4
+DELETE = 5
+THREAD = 6
+THREAD_REPLY = 7
+TAG = 8
+GROUP = 9
+SEARCH_URL = 10
+USER_MESSAGES = 11
+READ = 12
+RETWEET = 13
+LIKE = 14
+GEO_FRIEND_POSITIONS = 50

=== added file 'gwibber/microblog/digg.py'
--- gwibber/microblog/digg.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/digg.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,92 @@
+
+"""
+
+Digg interface for Gwibber
+SegPhault (Ryan Paul) - 01/06/2008
+
+"""
+
+import urllib2, support, re
+import time, simplejson
+
+PROTOCOL_INFO = {
+  "name": "Digg",
+  "version": 0.1,
+  
+  "config": [
+    "username",
+    "digg_color",
+    "comment_color",
+    "receive_enabled",
+  ],
+
+  "features": [
+    "receive",
+  ],
+}
+
+LINK_PARSE =  re.compile("<a[^>]+href=\"(https?://[^\"]+)\">[^<]+</a>")
+
+def sanitize_text(t):
+  return LINK_PARSE.sub("\\1", t.strip())
+
+class Message:
+  def __init__(self, client, data):
+    self.client = client
+    self.account = client.account
+    self.protocol = client.account["protocol"]
+    self.username = client.account["username"]
+    self.title = data["title"]
+    sender = data["friends"]["users"][0]
+    self.sender = "fullname" in sender and sender["fullname"] or sender["name"]
+    self.sender_nick = sender["name"]
+    self.sender_id = sender["name"]
+    self.id = data["id"]
+    
+    try:
+      self.time = support.parse_time(data["submit_date"])
+    except:
+      self.time = support.parse_time(time.asctime(time.gmtime(data["submit_date"])))
+    
+    self.text = sanitize_text(data["description"])
+    self.image = sender["icon"]
+    self.bgcolor = "comment_color"
+    self.url = data["link"]
+    self.profile_url = "http://digg.com/users/%s" % self.sender_nick
+    self.liked_by = data["diggs"]
+
+class Digg(Message):
+  def __init__(self, client, data):
+    Message.__init__(self, client, data)
+    self.title = "%s <small>dugg %s</small>" % (self.sender_nick, self.title)
+    self.bgcolor = "digg_color"
+
+class Client:
+  def __init__(self, acct):
+    self.account = acct
+
+  def receive_enabled(self):
+    return self.account["receive_enabled"] and \
+      self.account["username"] != None
+
+  def connect(self, url, data = None):
+    return urllib2.urlopen(urllib2.Request(url, data))
+
+  def get_comments(self):
+    return simplejson.load(self.connect(
+      "http://services.digg.com/user/%s/friends/commented?appkey=http://launchpad.net/gwibber&type=json" %
+        self.account["username"]))["stories"]
+
+  def get_diggs(self):
+    return simplejson.load(self.connect(
+      "http://services.digg.com/user/%s/friends/dugg?appkey=http://launchpad.net/gwibber&type=json" %
+        (self.account["username"])))["stories"]
+
+  def receive(self):
+    #for data in self.get_comments()[0:10]:
+    #  yield Message(self, data)
+
+    for data in self.get_diggs():
+      yield Digg(self, data)
+
+

=== added file 'gwibber/microblog/dispatcher.py'
--- gwibber/microblog/dispatcher.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/dispatcher.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,486 @@
+#!/usr/bin/env python
+
+import multiprocessing, threading, traceback, json, time, logging
+import gobject, dbus, dbus.service, mx.DateTime
+import twitter, identica, flickr, facebook, friendfeed
+
+import urlshorter
+import util, util.couch
+from util import resources
+from util.couch import Monitor as CouchMonitor
+from util.couch import RecordMonitor
+from desktopcouch.records.server import CouchDatabase
+from desktopcouch.records.record import Record as CouchRecord
+
+from util.const import *
+
+try:
+  import indicate
+except:
+  indicate = None
+
+gobject.threads_init()
+
+PROTOCOLS = {
+  "twitter": twitter,
+  "identica": identica,
+  "flickr": flickr,
+  "facebook": facebook,
+  "friendfeed": friendfeed,
+}
+
+FEATURES = json.loads(GWIBBER_OPERATIONS)
+SERVICES = dict([(k, v.PROTOCOL_INFO) for k, v in PROTOCOLS.items()])
+SETTINGS = RecordMonitor(COUCH_DB_SETTINGS, COUCH_RECORD_SETTINGS, COUCH_TYPE_CONFIG, DEFAULT_SETTINGS)
+
+def perform_operation((acctid, opname, args, transient)):
+  try:
+    stream = FEATURES[opname]["stream"] or opname
+    accounts = CouchDatabase(COUCH_DB_ACCOUNTS, create=True)
+    messages = CouchDatabase(COUCH_DB_MESSAGES, create=True)
+    account = dict(accounts.get_record(acctid).items())
+
+    logtext = "<%s:%s>" % (account["protocol"], opname)
+    logging.debug("%s Performing operation", logtext)
+
+    args = dict((str(k), v) for k, v in args.items())
+    message_data = PROTOCOLS[account["protocol"]].Client(account)(opname, **args)
+    new_messages = []
+
+    for m in message_data:
+      key = (m["id"], m["account"], opname, transient)
+      key = "-".join(x for x in key if x)
+      if not messages.record_exists(key):
+        m["operation"] = opname
+        m["stream"] = stream
+        m["transient"] = transient
+        
+        logging.debug("%s Adding record", logtext)
+        new_messages.append(m)
+        messages.put_record(CouchRecord(m, COUCH_TYPE_MESSAGE, key))
+
+    logging.debug("%s Finished operation", logtext)
+    return ("Success", new_messages)
+  except Exception as e:
+    if not "logtext" in locals(): logtext = "<UNKNOWN>"
+    logging.debug("%s Operation failed", logtext)
+    logging.debug("Traceback:\n%s", traceback.format_exc())
+    return ("Failure", traceback.format_exc())
+
+class OperationCollector:
+  def __init__(self):
+    self.accounts = CouchDatabase(COUCH_DB_ACCOUNTS, create=True)
+    self.settings = CouchDatabase(COUCH_DB_SETTINGS, create=True)
+    self.messages = CouchDatabase(COUCH_DB_MESSAGES, create=True)
+    util.couch.init_design_doc(self.messages, "messages", COUCH_VIEW_MESSAGES)
+
+  def handle_max_id(self, acct, opname, id=None):
+    if not id: id = acct["_id"]
+    if "sinceid" in SERVICES[acct["protocol"]]["features"]:
+      view = self.messages.execute_view("maxid", "messages")
+      result = view[[id, opname]][[id, opname]].rows
+      if len(result) > 0: return {"since": result[0].value}
+    return {}
+
+  def validate_operation(self, acct, opname, enabled="receive_enabled"):
+    protocol = SERVICES[acct["protocol"]]
+    return acct["protocol"] in PROTOCOLS and \
+           opname in protocol["features"] and \
+           opname in FEATURES and acct[enabled]
+
+  def stream_to_operation(self, stream):
+    account = self.accounts.get_record(stream["account"])
+    args = stream["parameters"]
+    opname = stream["operation"]
+    if self.validate_operation(account, opname):
+      args.update(self.handle_max_id(account, opname, stream["_id"]))
+      return (stream["account"], stream["operation"], args, stream["_id"])
+
+  def search_to_operations(self, search):
+    for account in self.accounts.get_records(COUCH_TYPE_ACCOUNT, True):
+      account = account.value
+      args = {"query": search["query"]}
+      if self.validate_operation(account, "search"):
+        args.update(self.handle_max_id(account, "search", search["_id"]))
+        yield (account["_id"], "search", args, search["_id"])
+
+  def account_to_operations(self, acct):
+    if isinstance(acct, basestring):
+      acct = dict(self.accounts.get_record(acct).items())
+    for opname in SERVICES[acct["protocol"]]["default_streams"]:
+      if self.validate_operation(acct, opname):
+        args = self.handle_max_id(acct, opname)
+        yield (acct["_id"], opname, args, False)
+
+  def get_send_operations(self, message):
+    for account in self.accounts.get_records(COUCH_TYPE_ACCOUNT, True):
+      account = account.value
+      if self.validate_operation(account, "send", "send_enabled"):
+        yield (account["_id"], "send", {"message": message}, False)
+
+  def get_operation_by_id(self, id):
+    if self.settings.record_exists(id):
+      item = dict(self.settings.get_record(id).items())
+      if item["record_type"] == COUCH_TYPE_STREAM:
+        return [self.stream_to_operation(item)]
+      if item["record_type"] == COUCH_TYPE_SEARCH:
+        return list(self.search_to_operations(item))
+        
+  def get_operations(self):
+    for acct in self.accounts.get_records(COUCH_TYPE_ACCOUNT, True):
+      acct = acct.value
+      for o in self.account_to_operations(acct):
+        yield o
+      
+    for stream in self.settings.get_records(COUCH_TYPE_STREAM, True):
+      stream = stream.value
+      if self.accounts.record_exists(stream["account"]):
+        o = self.stream_to_operation(stream)
+        if o: yield o
+
+    for search in self.settings.get_records(COUCH_TYPE_SEARCH, True):
+      search = search.value
+      for o in self.search_to_operations(search):
+        yield o
+
+class StreamMonitor(dbus.service.Object):
+  __dbus_object_path__ = "/com/gwibber/Streams"
+  
+  def __init__(self):
+    self.bus = dbus.SessionBus()
+    bus_name = dbus.service.BusName("com.Gwibber.Streams", bus=self.bus)
+    dbus.service.Object.__init__(self, bus_name, self.__dbus_object_path__)
+
+    setting_monitor = CouchMonitor(COUCH_DB_SETTINGS)
+    setting_monitor.connect("record-updated", self.on_setting_changed)
+    setting_monitor.connect("record-deleted", self.on_setting_deleted)
+
+  def on_setting_changed(self, monitor, id):
+    if id == "settings": self.SettingChanged()
+    else:
+      logging.debug("Stream changed: %s", id)
+      self.StreamChanged(id)
+
+  def on_setting_deleted(self, monitor, id):
+    logging.debug("Stream closed: %s", id)
+    self.StreamClosed(id)
+
+  @dbus.service.signal("com.Gwibber.Streams", signature="s")
+  def StreamChanged(self, id): pass
+
+  @dbus.service.signal("com.Gwibber.Streams", signature="s")
+  def StreamClosed(self, id): pass
+
+  @dbus.service.signal("com.Gwibber.Streams")
+  def SettingChanged(self): pass
+
+class AccountMonitor(dbus.service.Object):
+  __dbus_object_path__ = "/com/gwibber/Accounts"
+
+  def __init__(self):
+    self.bus = dbus.SessionBus()
+    bus_name = dbus.service.BusName("com.Gwibber.Accounts", bus=self.bus)
+    dbus.service.Object.__init__(self, bus_name, self.__dbus_object_path__)
+
+    account_monitor = CouchMonitor(COUCH_DB_ACCOUNTS)
+    account_monitor.connect("record-updated", self.on_account_changed)
+    account_monitor.connect("record-deleted", self.on_account_deleted)
+
+  def on_account_changed(self, monitor, id):
+    logging.debug("Account changed: %s", id)
+    self.AccountChanged(id)
+
+  def on_account_deleted(self, monitor, id):
+    logging.debug("Account deleted: %s", id)
+    self.AccountDeleted(id)
+
+  @dbus.service.signal("com.Gwibber.Accounts", signature="s")
+  def AccountChanged(self, id): pass
+
+  @dbus.service.signal("com.Gwibber.Accounts", signature="s")
+  def AccountDeleted(self, id): pass
+
+class MessagesMonitor(dbus.service.Object):
+  __dbus_object_path__ = "/com/gwibber/Messages"
+
+  def __init__(self):
+    self.bus = dbus.SessionBus()
+    bus_name = dbus.service.BusName("com.Gwibber.Messages", bus=self.bus)
+    dbus.service.Object.__init__(self, bus_name, self.__dbus_object_path__)
+
+    self.monitor = CouchMonitor(COUCH_DB_MESSAGES)
+    self.monitor.connect("record-updated", self.on_message_updated)
+
+    self.messages = CouchDatabase(COUCH_DB_MESSAGES, create=True)
+
+    self.indicator_items = {}
+    self.notified_items = []
+
+    if indicate and util.resources.get_desktop_file():
+      self.indicate = indicate.indicate_server_ref_default()
+      self.indicate.set_type("message.gwibber")
+      self.indicate.set_desktop_file(util.resources.get_desktop_file())
+      self.indicate.connect("server-display", self.on_indicator_activate)
+      self.indicate.show()
+
+  def on_message_updated(self, monitor, id):
+    try:
+      logging.debug("Message updated: %s", id)
+      message = self.messages.get_record(id)
+      self.new_message(message)
+    except:
+      logging.debug("Message updated: %s, failed", id)
+    
+
+  @dbus.service.signal("com.Gwibber.Messages", signature="s")
+  def MessageUpdated(self, id): pass
+
+  def on_indicator_activate(self, indicator, timestamp):
+    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+    client_bus = dbus.SessionBus()
+    logging.debug("Raising gwibber client")
+    try:
+      client_obj = client_bus.get_object("com.GwibberClient",
+        "/com/GwibberClient", follow_name_owner_changes = True,
+        introspect = False)
+      gw = dbus.Interface(client_obj, "com.GwibberClient")
+      gw.focus_client(reply_handler=self.handle_focus_reply,
+                      error_handler=self.handle_focus_error)
+    except dbus.DBusException:
+      print_exc()
+
+
+  def on_indicator_reply_activate(self, indicator, timestamp):
+    logging.debug("Raising gwibber client, focusing replies stream")
+    client_bus = dbus.SessionBus()
+    try:
+      client_obj = client_bus.get_object("com.GwibberClient", "/com/GwibberClient")
+      gw = dbus.Interface(client_obj, "com.GwibberClient")
+      gw.show_replies(reply_handler=self.handle_focus_reply,
+                      error_handler=self.handle_focus_error)
+      indicator.hide()
+    except dbus.DBusException:
+      print_exc()
+
+  def handle_focus_reply(self, *args):
+    logging.error("Failed to raise client %s", args)
+
+  def handle_focus_error(self, *args):
+    logging.error("Failed to raise client %s", args)
+
+  def new_message(self, message):
+    min_time = mx.DateTime.DateTimeFromTicks() - mx.DateTime.TimeDelta(minutes=10.0)
+    logging.debug("Checking message %s timestamp (%s) to see if it is newer than %s", message["id"], mx.DateTime.DateTimeFromTicks(message["time"]).localtime(), min_time)
+    if mx.DateTime.DateTimeFromTicks(message["time"]).localtime()  > mx.DateTime.DateTimeFromTicks(min_time):
+      logging.debug("Message %s newer than %s, notifying", message["id"], min_time)      
+      if indicate and message["stream"] == "replies":
+        if message["id"] not in self.indicator_items:
+          logging.debug("Message %s is a reply, adding messaging indicator", message["id"])
+          self.handle_indicator_items(message)
+      if message["id"] not in self.notified_items:
+        self.notified_items.append(message["id"])
+        self.show_notification_bubble(message)
+
+  def handle_indicator_item(self, message):
+    indicator = indicate.Indicator() if hasattr(indicate, "Indicator") else indicate.IndicatorMessage()
+    indicator.connect("user-display", self.on_indicator_reply_activate)
+    indicator.set_property("subtype", "im")
+    indicator.set_property("sender", message["sender"].get("name", ""))
+    indicator.set_property("body", message["text"])
+    indicator.set_property_time("time",
+        mx.DateTime.DateTimeFromTicks(message["time"]).localtime().ticks())
+    self.indicator_items[message["id"]] = indicator
+    indicator.show()
+
+  def show_notification_bubble(self, message):
+    if util.can_notify and SETTINGS["show_notifications"]:
+      if SETTINGS["notify_mentions_only"] and not message["stream"] == "replies": return
+      #until image caching is working again, we will post the gwibber icon
+      #image = hasattr(message, "image_path") and message["image_path"] or ''
+      image = util.resources.get_ui_asset("gwibber.svg")
+      expire_timeout = 5000
+      n = util.notify(message["sender"].get("name", ""), message["text"], image, expire_timeout)
+
+class MapAsync(threading.Thread):
+  def __init__(self, func, iterable, cbsuccess, cbfailure, timeout=60):
+    threading.Thread.__init__(self)
+    self.iterable = iterable
+    self.callback = cbsuccess
+    self.failure = cbfailure
+    self.timeout = timeout
+    self.daemon = True
+    self.func = func
+    self.start()
+
+  def run(self):
+    try:
+      pool = multiprocessing.Pool()
+      pool.map_async(self.func, self.iterable, callback=self.callback).get(self.timeout)
+    except Exception as e:
+      self.failure(e, traceback.format_exc())
+
+class Dispatcher(dbus.service.Object, threading.Thread):
+  __dbus_object_path__ = "/com/gwibber/Service"
+
+  def __init__(self, loop, autorefresh=True):
+    self.bus = dbus.SessionBus()
+    bus_name = dbus.service.BusName("com.Gwibber.Service", bus=self.bus)
+    dbus.service.Object.__init__(self, bus_name, self.__dbus_object_path__)
+    threading.Thread.__init__(self)
+    
+    self.collector = OperationCollector()
+
+    self.refresh_count = 0
+    self.mainloop = loop
+
+    if autorefresh:
+      gobject.timeout_add(60 * 1000 * 5, self.refresh)
+      self.refresh()
+
+    self.accounts = CouchDatabase(COUCH_DB_ACCOUNTS, create=True)
+
+  @dbus.service.signal("com.Gwibber.Service")
+  def LoadingComplete(self): pass
+
+  @dbus.service.signal("com.Gwibber.Service")
+  def LoadingStarted(self): pass
+
+  @dbus.service.method("com.Gwibber.Service")
+  def Refresh(self): self.refresh()
+
+  @dbus.service.method("com.Gwibber.Service", in_signature="s")
+  def PerformOp(self, opdata):
+    try: o = json.loads(opdata)
+    except: return
+    
+    logging.debug("** Starting Single Operation **")
+    self.LoadingStarted()
+    
+    params = ["account", "operation", "args", "transient"]
+    operation = None
+    
+    if "id" in o:
+      operation = self.collector.get_operation_by_id(o["id"])
+    elif all(i in o for i in params):
+      operation = [tuple(o[i] for i in params)]
+    elif "account" in o and self.accounts.record_exists(o["account"]):
+      operation = self.collector.account_to_operations(o["account"])
+
+    if operation:
+      MapAsync(perform_operation, operation, self.loading_complete, self.loading_failed)
+
+  @dbus.service.method("com.Gwibber.Service", in_signature="s")
+  def SendMessage(self, message):
+    self.send(self.collector.get_send_operations(message))
+
+  @dbus.service.method("com.Gwibber.Service", in_signature="s")
+  def Send(self, opdata):
+    try:
+      o = json.loads(opdata)
+      if "target" in o:
+        args = {"message": o["message"], "target": o["target"]}
+        operations = [(o["target"]["account"], "send_thread", args, None)]
+      elif "accounts" in o:
+        operations = [(a, "send", {"message": o["message"]}, None) for a in o["accounts"]]
+      self.send(operations)
+    except: pass
+
+  @dbus.service.method("com.Gwibber.Service", out_signature="s")
+  def GetServices(self): return json.dumps(SERVICES)
+
+  @dbus.service.method("com.Gwibber.Service", out_signature="s")
+  def GetFeatures(self): return json.dumps(FEATURES)
+
+  @dbus.service.method("com.Gwibber.Service", out_signature="s")
+  def GetAccounts(self): 
+    all_accounts = []
+    for account in self.accounts.get_records(COUCH_TYPE_ACCOUNT, True):
+      all_accounts.append(account.value)
+    return json.dumps(all_accounts)
+
+  @dbus.service.method("com.Gwibber.Service")
+  def Quit(self): self.mainloop.quit()
+  
+  def loading_complete(self, output):
+    self.refresh_count += 1
+    self.LoadingComplete()
+    logging.debug("Loading complete: %s - %s", self.refresh_count, [o[0] for o in output])
+
+  def loading_failed(self, exception, tb):
+    logging.debug("Loading failed: %s - %s", exception, tb)
+
+  def send(self, operations):
+    operations = util.compact(operations)
+    if operations:
+      self.LoadingStarted()
+      logging.debug("*** Sending Message ***")
+      MapAsync(perform_operation, operations, self.loading_complete, self.loading_failed)
+
+  def refresh(self):
+    operations = list(self.collector.get_operations())
+    if operations:
+      logging.debug("** Starting Refresh **")
+      self.LoadingStarted()
+      MapAsync(perform_operation, operations, self.loading_complete, self.loading_failed)
+    return True
+
+class ConnectionMonitor(dbus.service.Object):
+  __dbus_object_path__ = "/com/gwibber/Connection"
+
+  def __init__(self):
+    self.bus = dbus.SessionBus()
+    bus_name = dbus.service.BusName("com.Gwibber.Connection", bus=self.bus)
+    dbus.service.Object.__init__(self, bus_name, self.__dbus_object_path__)
+
+    self.sysbus = dbus.SystemBus()
+    try:
+      self.nm = self.sysbus.get_object(NM_DBUS_SERVICE, NM_DBUS_OBJECT_PATH)
+      self.nm.connect_to_signal("StateChanged", self.on_connection_changed)
+    except:
+      pass
+
+  def on_connection_changed(self, state):
+    if state == NM_STATE_CONNECTED:
+      logging.info("Network state changed to Online")
+      self.ConnectionOnline(state)
+    if state == NM_STATE_DISCONNECTED:
+      logging.info("Network state changed to Offline")
+      self.ConnectionOffline(state)
+
+  @dbus.service.signal("com.Gwibber.Connetion", signature="u")
+  def ConnectionOnline(self, state): pass
+
+  @dbus.service.signal("com.Gwibber.Connection", signature="u")
+  def ConnectionOffline(self, state): pass
+
+  @dbus.service.method("com.Gwibber.Connection")
+  def isConnected(self): 
+    try:
+      if self.nm.state() == NM_STATE_CONNECTED:
+        return True
+      return False
+    except:
+      return True
+
+class URLShorten(dbus.service.Object):
+  __dbus_object_path__ = "/com/gwibber/URLShorten"
+
+  def __init__(self):
+    self.bus = dbus.SessionBus()
+    bus_name = dbus.service.BusName("com.Gwibber.URLShorten", bus=self.bus)
+    dbus.service.Object.__init__(self, bus_name, self.__dbus_object_path__)
+
+  @dbus.service.method("com.Gwibber.URLShorten")
+  def Shorten(self, url, service):
+    if self.IsShort(url): return url
+    try:
+      s = urlshorter.PROTOCOLS[service].URLShorter()
+      return s.short(url)
+    except: return url
+
+  @dbus.service.method("com.Gwibber.URLShorten")
+  def IsShort(self, url):
+    for us in urlshorter.PROTOCOLS.values():
+      if url.startswith(us.PROTOCOL_INFO["fqdn"]):
+        return True
+    return False

=== added file 'gwibber/microblog/facebook.py'
--- gwibber/microblog/facebook.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/facebook.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,174 @@
+import network, util
+import hashlib, mx.DateTime, time
+from gettext import lgettext as _
+
+PROTOCOL_INFO = {
+  "name": "Facebook",
+  "version": "1.0",
+  
+  "config": [
+    "color",
+    "receive_enabled",
+    "send_enabled",
+    "username",
+    "session_key",
+    "secret_key"
+  ],
+
+  "authtype": "facebook",
+  "color": "#64006C",
+
+  "features": [
+    "send",
+    "reply",
+    "receive",
+    "thread",
+    "delete",
+    "send_thread",
+    "like",
+  ],
+
+  "default_streams": [
+    "receive",
+  ]
+}
+
+APP_KEY = "71b85c6d8cb5bbb9f1a3f8bbdcdd4b05"
+URL_PREFIX = "https://api.facebook.com/restserver.php"
+
+class Client:
+  def __init__(self, acct):
+    self.account = acct
+    self.user_id = acct["session_key"].split("-")[1]
+
+  def _get(self, operation, post=False, single=False, **args):
+    args.update({
+      "v": "1.0",
+      "format": "json",
+      "method": "facebook." + operation,
+      "api_key": APP_KEY,
+      "session_key": self.account["session_key"],
+      "call_id": str(int(time.time()) * 1000),
+    })
+
+    sig = "".join("%s=%s" % (k, v) for k, v in sorted(args.items()))
+    args["sig"] = hashlib.md5(sig + self.account["secret_key"]).hexdigest()
+    data = network.Download(URL_PREFIX, args, post).get_json()
+    return data
+
+  def _sender(self, user):
+    sender = {
+      "name": user["name"],
+      "id": str(user["id"]),
+      "is_me": str(user["id"]) == self.user_id,
+      "url": user["url"],
+      "image": user["pic_square"],
+    }
+    
+    if not "?" in user["url"]:
+      sender["nick"] = user["url"].rsplit("/", 1)[-1]
+    return sender
+  
+  def _message(self, data, profiles):
+    m = {}
+    m["id"] = str(data["post_id"])
+    m["protocol"] = "facebook"
+    m["account"] = self.account["_id"]
+    m["time"] = int(mx.DateTime.DateTimeFrom(data['created_time']).gmtime())
+
+    if data.get("attribution", 0):
+      m["source"] = util.strip_urls(data["attribution"]).replace("via ", "")
+    
+    if data.get("message", "").strip():
+      m["text"] = data["message"]
+      m["html"] = util.linkify(data["message"])
+      m["content"] = m["html"]
+    else:
+      m["text"] = ""
+      m["html"] = ""
+      m["content"] = ""
+
+    if data.get("actor_id", 0) in profiles:
+      m["sender"] = self._sender(profiles[data["actor_id"]])
+
+    if data.get("likes", {}).get("count", None):
+      m["likes"] = {
+        "count": data["likes"]["count"],
+        "url": data["likes"]["href"],
+      }
+
+    if data.get("comments", 0):
+      m["comments"] = []
+      for item in data["comments"]["comment_list"]:
+        m["comments"].append({
+          "text": item["text"],
+          "time": int(mx.DateTime.DateTimeFrom(item["time"]).gmtime()),
+          "sender": self._sender(profiles[item["fromid"]]),
+        })
+
+    if data.get("attachment", 0):
+      if data["attachment"].get("name", 0):
+        m["content"] += "<p><b>%s</b></p>" % data["attachment"]["name"]
+
+      if data["attachment"].get("description", 0):
+        m["content"] += "<p>%s</p>" % data["attachment"]["description"]
+
+      m["images"] = []
+      for a in data["attachment"].get("media", []):
+        if a["type"] in ["photo", "video", "link"]:
+          if a.get("src", 0):
+            if a["src"].startswith("/"):
+              a["src"] = "http://facebook.com" + a["src"]
+            m["images"].append({"src": a["src"], "url": a["href"]})
+
+    return m
+
+  def _comment(self, data, profiles):
+    user = profiles[data["fromid"]]
+    return {
+      "id": str(data["id"]),
+      "protocol": "facebook",
+      "account": self.account["_id"],
+      "time": int(mx.DateTime.DateTimeFrom(data['time']).gmtime()),
+      "text": data["text"],
+      "sender": {
+        "nick": user["username"] or str(user["uid"]),
+        "name": user["name"],
+        "id": str(user["uid"]),
+        "url": user["profile_url"],
+        "image": user["pic_square"],
+      }
+    }
+
+  def __call__(self, opname, **args):
+    return getattr(self, opname)(**args)
+
+  def thread(self, id):
+    query = "SELECT name, profile_url, pic_square, username, uid FROM user WHERE uid in \
+      (SELECT fromid FROM comment WHERE post_id = '%s')" % id
+    
+    profiles = dict((p["uid"], p) for p in self._get("fql.query", query=query))
+    comments = self._get("stream.getComments", post_id=id)
+    return [self._comment(comment, profiles) for comment in comments]
+
+  def receive(self):
+    data = self._get("stream.get", viewer_id=self.user_id, limit=80)
+    profiles = dict((p["id"], p) for p in data["profiles"])
+    return [self._message(post, profiles) for post in data["posts"]]
+
+  def delete(self, message):
+    self._get("stream.remove", post_id=message["id"])
+    return []
+
+  def like(self, message):
+    self._get("stream.addLike", post_id=message["id"])
+    return []
+
+  def send(self, message):
+    self._get("users.setStatus", status=message, status_includes_verb=False)
+    return []
+
+  def send_thread(self, message, target):
+    self._get("stream.addComment", post_id=target["id"], comment=message)
+    return []
+

=== added file 'gwibber/microblog/flickr.py'
--- gwibber/microblog/flickr.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/flickr.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,84 @@
+import re, network, util, mx.DateTime
+
+PROTOCOL_INFO = {
+  "name": "Flickr",
+  "version": 1.0,
+  
+  "config": [
+    "username",
+    "color",
+    "receive_enabled",
+  ],
+
+  "authtype": "none",
+  "color": "#C31A00",
+
+  "features": [
+    "receive",
+  ],
+
+  "default_streams": [
+    "receive"
+  ]
+}
+
+API_KEY = "36f660117e6555a9cbda4309cfaf72d0"
+REST_SERVER = "http://api.flickr.com/services/rest"
+BUDDY_ICON_URL = "http://farm%s.static.flickr.com/%s/buddyicons/%s.jpg"
+IMAGE_URL = "http://farm%s.static.flickr.com/%s/%s_%s_%s.jpg"
+IMAGE_PAGE_URL = "http://www.flickr.com/photos/%s/%s"
+
+def parse_time(t):
+  return mx.DateTime.DateTimeFromTicks(int(t)).gmtime().ticks()
+
+class Client:
+  def __init__(self, acct):
+    self.account = acct
+
+  def _message(self, data):
+    m = {}
+    m["id"] = str(data["id"])
+    m["protocol"] = "flickr"
+    m["account"] = self.account["_id"]
+    m["time"] = parse_time(data["dateupload"])
+    m["source"] = False
+    m["text"] = data["title"]
+
+    m["sender"] = {}
+    m["sender"]["name"] = data["username"]
+    m["sender"]["nick"] = data["ownername"]
+    m["sender"]["is_me"] = data["ownername"] == self.account["username"]
+    m["sender"]["id"] = data["owner"]
+    m["sender"]["image"] = BUDDY_ICON_URL % (data["iconfarm"], data["iconserver"], data["owner"])
+    m["sender"]["url"] = "http://www.flickr.com/people/%s" % (data["owner"])
+
+    m["url"] = IMAGE_PAGE_URL % (data["owner"], data["id"])
+    m["images"] = [{
+      "src": IMAGE_URL % (data["farm"], data["server"], data["id"], data["secret"], "m"),
+      "url": IMAGE_PAGE_URL % (data["owner"], data["id"])
+    }]
+
+    m["content"] = data["title"]
+    m["html"] = data["title"]
+
+    return m
+
+  def _get(self, method, parse="message", post=False, **args):
+    args.update({"api_key": API_KEY, "method": method})
+    data = network.Download(REST_SERVER, args, post).get_json()
+    if parse == "message":
+      return [self._message(m) for m in data["photos"]["photo"]]
+    else: return data
+
+  def _getNSID(self):
+    return self._get("flickr.people.findByUsername",
+        parse=None, nojsoncallback="1", format="json",
+        username=self.account["username"])["user"]["nsid"]
+
+  def __call__(self, opname, **args):
+    return getattr(self, opname)(**args)
+
+  def receive(self):
+    return self._get("flickr.photos.getContactsPublicPhotos",
+      user_id=self._getNSID(), format="json", nojsoncallback="1",
+      extras="date_upload,owner_name,icon_server")

=== added file 'gwibber/microblog/friendfeed.py'
--- gwibber/microblog/friendfeed.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/friendfeed.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,144 @@
+
+import network, util
+
+PROTOCOL_INFO = {
+  "name": "FriendFeed",
+  "version": 0.1,
+  
+  "config": [
+    "private:password",
+    "username",
+    "color",
+    "receive_enabled",
+    "send_enabled",
+  ],
+
+  "authtype": "login",
+  "color": "#198458",
+
+  "features": [
+    "send",
+    "receive",
+    "public",
+    "search",
+    "reply",
+    "thread",
+    "send_thread",
+    "like",
+    "delete",
+    "search_url",
+    "user_messages",
+  ],
+
+  "default_streams": [
+    "receive"
+  ]
+}
+
+URL_PREFIX = "https://friendfeed.com/api"
+
+class Client:
+  def __init__(self, acct):
+    self.account = acct
+
+  def _sender(self, user):
+    return {
+      "name": user["name"],
+      "nick": user["nickname"],
+      "is_me": self.account["username"] == user["nickname"],
+      "id": user["id"],
+      "url": user["profileUrl"],
+      "image": "http://friendfeed.com/%s/picture?size=medium" % user["nickname"],
+    }
+
+  def _message(self, data):
+    m = {
+      "id": data["id"],
+      "protocol": "friendfeed",
+      "account": self.account["_id"],
+      "time": util.parsetime(data["published"]),
+      "source": data.get("via", {}).get("name", None),
+      "text": data["title"],
+      "html": util.linkify(data["title"]),
+      "content": util.linkify(data["title"]),
+      "url": data["link"],
+      "sender": self._sender(data["user"]),
+    }
+    
+    if data.get("service", 0):
+      m["service"] = {
+        "id": data["service"]["id"],
+        "name": data["service"]["name"],
+        "icon": data["service"]["iconUrl"],
+        "url": data["service"]["profileUrl"],
+      }
+
+    if data.get("likes", 0):
+      m["likes"] = {"count": len(data["likes"])}
+
+    if data.get("comments", 0):
+      m["comments"] = []
+      for item in data["comments"][-3:]:
+        m["comments"].append({
+          "text": item["body"],
+          "time": util.parsetime(item["date"]),
+          "sender": self._sender(item["user"]),
+        })
+
+    for i in data["media"]:
+      if i.get("thumbnails", 0):
+        m["images"] = []
+        for t in i["thumbnails"]:
+          m["images"].append({"src": t["url"], "url": i["link"]})
+
+    if data.get("geo", 0):
+      m["location"] = data["geo"]
+
+    return m
+
+  def _get(self, path, post=False, parse="message", kind="entries", single=False, **args):
+    url = "/".join((URL_PREFIX, path))
+    data = network.Download(url, util.compact(args), post,
+        self.account["username"], self.account["password"]).get_json()
+    
+    if parse:
+      data = data[kind][0] if single else data[kind]
+      return [getattr(self, "_%s" % parse)(m) for m in data]
+
+  def __call__(self, opname, **args):
+    return getattr(self, opname)(**args)
+
+  def receive(self, count=util.COUNT, since=None):
+    return self._get("feed/home", num=count, start=since)
+
+  def public(self, count=util.COUNT, since=None):
+    return self._get("feed/public", num=count, start=since)
+
+  def thread(self, id, count=util.COUNT, since=None):
+    self._get("feed/entry/%s" % id, num=count, start=since)
+
+  def search(self, query, count=util.COUNT, since=None):
+    return self._get("feed/search", q=query, num=count, start=since)
+
+  def search_url(self, query, count=util.COUNT, since=None):
+    return self._get("feed/url", url=query, num=util.COUNT, start=None)
+
+  def user_messages(self, id, count=util.COUNT, since=None):
+    return self._get("feed/user/%s" % id, num=count, start=since)
+
+  def delete(self, message):
+    self._get("entry/delete", True, None, entry=message["id"])
+    return []
+
+  def like(self, message):
+    self._get("entry/like", True, None, entry=message["id"])
+    return []
+
+  def send(self, message):
+    self._get("share", True, single=True, title=message)
+    return []
+
+  def send_thread(self, message, target):
+    self._get("comment", True, None, body=message, entry=target["id"])
+    return []
+

=== added file 'gwibber/microblog/greader.py'
--- gwibber/microblog/greader.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/greader.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,151 @@
+
+"""
+
+Google Reader interface for Gwibber
+Grillo (Diego Herrera) - 7/02/2009
+
+bassed on RSS interface:
+SegPhault (Ryan Paul) - 11/08/2008
+
+"""
+
+from . import support
+import urlparse, logging, feedparser
+import urllib, urllib2, re
+import webbrowser
+
+PROTOCOL_INFO = {
+  "name": "Google Reader",
+  "version": 0.1,
+
+  "config": [
+    "private:password",
+    "username",
+    "message_color",
+    "receive_enabled",
+  ],
+
+  "features": [
+    can.RECEIVE,
+    can.READ,
+  ],
+}
+
+feedparser._HTMLSanitizer.acceptable_elements = []
+
+class Message:
+  def __init__(self, client, data):
+    self.client = client
+    self.account = client.account
+    self.protocol = client.account["protocol"]
+    self.username = client.account["username"]
+
+    self.source = ""
+    self.sender = data.get("author", "")
+
+    if hasattr(data, "source"):
+        self.source = data.source.get("title", "")
+        self.sender = data.source.get("title", "")
+        self.profile_url = data.source.link
+
+    self.gr_id = data.get("id", "")
+
+    self.image = "http://www.google.com/reader/ui/2296270177-logo-graphic.gif";
+    self.sender_nick = data.get("author", "")
+    self.sender_id = self.sender
+
+    self.time = support.parse_time(data.updated)
+    self.bgcolor = "message_color"
+    self.url = data.get("link", "")
+
+    if(self.source == ""):
+        self.title = self.sender
+    else:
+        self.title = "%s <small>By %s</small>" % (self.source, self.sender)
+
+    self.is_unread = True
+    self.categories = []
+
+    for category in data.tags:
+      if( (category.term.find("user/")>=0) and (category.term.find("/state/")>=0) and (category.label=='read') ):
+        self.is_unread = False
+      elif((category.term.find("user/")>=0) and (category.term.find("/label/")>=0)):
+        self.categories.append(category.label)
+
+    self.summary = data.get("summary", "")
+    self.html_string = data.title
+
+    if(len(self.summary) > 0):
+      self.text = self.summary
+    else:
+      self.text = data.source.get("title", "")
+
+class Client:
+    def __init__(self, acct):
+        self.account = acct
+        if(self.account["session"]!= None):
+            self.sid = self.account["session"]
+        else:
+            self.get_auth()
+
+
+    def get_auth(self):
+        header = {'User-agent' : 'Gwibber'}
+        post_data = urllib.urlencode({ 'Email': self.account["username"],
+                                       'Passwd': self.account["private:password"],
+                                       'service': 'reader',
+                                       'source': 'Gwibber',
+                                       'continue': 'http://www.google.com', })
+
+        request = urllib2.Request('https://www.google.com/accounts/ClientLogin',
+                                  post_data,
+                                  header)
+        try :
+            f = urllib2.urlopen( request )
+            res = f.read()
+        except:
+            raise
+        self.sid = re.search('SID=(\S*)', res).group(1)
+        self.account["session"] = self.sid
+
+    def get_results(self,url, data = None,  count = 0):
+        header ={'User-agent' : 'Gwibber',
+                 'Cookie': 'Name=SID;SID=%s;Domain=.google.com;Path=/;Expires=160000000000' % self.sid}
+        request = urllib2.Request(url, data, header)
+        try :
+            f = urllib2.urlopen( request )
+            if(f.url != url):
+                self.get_auth()
+                if(count < 3):
+                    res = self.get_results(url, data, count+1)
+                else:
+                    res = None
+            else:
+                res = f.read()
+        except:
+            res = None
+        return res
+
+    def read_message(self, message):
+        webbrowser.open (message.url)
+        if message.is_unread:
+            token = self.get_results('http://www.google.com/reader/api/0/token')
+            post_data = urllib.urlencode ({ 'i' : message.gr_id,
+                                            'T' : token,
+                                            'ac' : 'edit-tags' ,
+                                            'a' : 'user/-/state/com.google/read' })
+
+            url = 'http://www.google.com/reader/api/0/edit-tag'
+            self.get_results(url, post_data)
+            message.is_unread = False
+            return True
+        return False
+
+    def get_messages(self):
+        return feedparser.parse(
+            self.get_results(
+            'http://www.google.com/reader/atom/user/-/state/com.google/reading-list?n=%s' % '20' if (self.account["receive_count"] == None) else self.account["receive_count"])).entries
+
+    def receive(self):
+        for data in self.get_messages():
+            yield Message(self, data)

=== added file 'gwibber/microblog/identica.py'
--- gwibber/microblog/identica.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/identica.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,165 @@
+import re, network, util
+from gettext import lgettext as _
+
+PROTOCOL_INFO = {
+  "name": "Identi.ca",
+  "version": 1.0,
+  
+  "config": [
+    "private:password",
+    "username",
+    "color",
+    "receive_enabled",
+    "send_enabled",
+  ],
+
+  "authtype": "login",
+  "color": "#4E9A06",
+
+  "features": [
+    "send",
+    "receive",
+    "search",
+    "tag",
+    "reply",
+    "responses",
+    "private",
+    "public",
+    "delete",
+    "retweet",
+    "like",
+    "send_thread",
+    "user_messages",
+    "sinceid",
+  ],
+
+  "default_streams": [
+    "receive",
+    "responses",
+    "private",
+  ],
+}
+
+URL_PREFIX = "https://identi.ca"
+
+class Client:
+  def __init__(self, acct):
+    self.account = acct
+
+  def _common(self, data):
+    m = {}
+    m["id"] = str(data["id"])
+    m["protocol"] = "identica"
+    m["account"] = self.account["_id"]
+    m["time"] = util.parsetime(data["created_at"])
+    m["source"] = data.get("source", False)
+    m["text"] = data["text"]
+    m["to_me"] = ("@%s" % self.account["username"]) in data["text"]
+
+    m["html"] = util.linkify(m["text"],
+      ((util.PARSE_HASH, '#<a class="hash" href="%s#search?q=\\1">\\1</a>' % URL_PREFIX),
+      (util.PARSE_NICK, '@<a class="nick" href="%s/\\1">\\1</a>' % URL_PREFIX)))
+
+    m["content"] = util.linkify(m["text"],
+      ((util.PARSE_HASH, '#<a class="hash" href="gwibber:/tag?acct=%s&query=\\1">\\1</a>' % m["account"]),
+      (util.PARSE_NICK, '@<a class="nick" href="gwibber:/user?acct=%s&name=\\1">\\1</a>' % m["account"])))
+
+    return m
+
+  def _message(self, data):
+    m = self._common(data)
+    
+    if data.get("in_reply_to_status_id", 0) and data.get("in_reply_to_screen_name", 0):
+      m["reply"] = {}
+      m["reply"]["id"] = data["in_reply_to_status_id"]
+      m["reply"]["nick"] = data["in_reply_to_screen_name"]
+      m["reply"]["url"] = "/".join((URL_PREFIX, "notice", str(m["reply"]["id"])))
+
+    user = data.get("user", data.get("sender", 0))
+    
+    m["sender"] = {}
+    m["sender"]["name"] = user["name"]
+    m["sender"]["nick"] = user["screen_name"]
+    m["sender"]["id"] = user["id"]
+    m["sender"]["location"] = user["location"]
+    m["sender"]["followers"] = user["followers_count"]
+    m["sender"]["image"] = user["profile_image_url"]
+    m["sender"]["url"] = "/".join((URL_PREFIX, m["sender"]["nick"]))
+    m["sender"]["is_me"] = m["sender"]["nick"] == self.account["username"]
+    m["url"] = "/".join((URL_PREFIX, "notice", m["id"]))
+    return m
+
+  def _private(self, data):
+    m = self._message(data)
+    m["private"] = True
+    return m
+
+  def _result(self, data):
+    m = self._common(data)
+    
+    if data["to_user_id"]:
+      m["reply"] = {}
+      m["reply"]["id"] = data["to_user_id"]
+      m["reply"]["nick"] = data["to_user"]
+
+    m["sender"] = {}
+    m["sender"]["nick"] = data["from_user"]
+    m["sender"]["id"] = data["from_user_id"]
+    m["sender"]["image"] = data["profile_image_url"]
+    m["sender"]["url"] = "/".join((URL_PREFIX, m["sender"]["nick"]))
+    m["url"] = "/".join((m["sender"]["url"], "statuses", m["id"]))
+    return m
+
+  def _get(self, path, parse="message", post=False, single=False, **args):
+    url = "/".join((URL_PREFIX, "api", path))
+    data = network.Download(url, util.compact(args), post,
+        self.account["username"], self.account["password"])
+    data = data.get_json()
+    if single: return [getattr(self, "_%s" % parse)(data)]
+    if parse: return [getattr(self, "_%s" % parse)(m) for m in data if "user" in m or "sender" in m]
+    else: return []
+
+  def _search(self, **args):
+    data = network.Download("%s/api/search.json" % URL_PREFIX, util.compact(args))
+    data = data.get_json()["results"]
+    return [self._result(m) for m in data]
+
+  def __call__(self, opname, **args):
+    return getattr(self, opname)(**args)
+  
+  def receive(self, count=util.COUNT, since=None):
+    return self._get("statuses/friends_timeline.json", count=count, since_id=since)
+
+  def user_messages(self, id=None, count=util.COUNT, since=None):
+    return self._get("statuses/user_timeline.json", id=id, count=count, since_id=since)
+
+  def responses(self, count=util.COUNT, since=None):
+    return self._get("statuses/mentions.json", count=count, since_id=since)
+
+  def private(self, count=util.COUNT, since=None):
+    return self._get("direct_messages.json", "private", count=count, since_id=since)
+
+  def public(self):
+    return self._get("statuses/public_timeline.json")
+
+  def search(self, query, count=util.COUNT, since=None):
+    return self._search(q=query, rpp=count, since_id=since)
+
+  def tag(self, query, count=util.COUNT, since=None):
+    return self._search(q="#%s" % query, count=count, since_id=since)
+
+  def delete(self, message):
+    self._get("statuses/destroy/%s.json" % message["id"], None, post=True, do=1)
+    return []
+
+  def like(self, message):
+    self._get("favorites/create/%s.json" % message["id"], None, post=True, do=1)
+    return []
+
+  def send(self, message):
+    return self._get("statuses/update.json", post=True, single=True,
+        status=message, source="Gwibber")
+
+  def send_thread(self, message, target):
+    return self._get("statuses/update.json", post=True, single=True,
+        status=message, source="gwibber", in_reply_to_status_id=target["id"])

=== added file 'gwibber/microblog/jaiku.py'
--- gwibber/microblog/jaiku.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/jaiku.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,142 @@
+
+"""
+
+Jaiku interface for Gwibber
+SegPhault (Ryan Paul) - 01/05/2008
+
+"""
+
+from . import support
+import urllib2, urllib, re, simplejson, urlparse
+
+PROTOCOL_INFO = {
+  "name": "Jaiku",
+  "version": 0.3,
+  
+  "config": [
+    "private:password",
+    "username",
+    "message_color",
+    "comment_color",
+    "receive_enabled",
+    "send_enabled"
+  ],
+
+  "features": [
+    "send",
+    "receive",
+    "reply",
+    "thread",
+    "send_thread",
+  ],
+}
+
+NONCE_PARSE = re.compile('.*_nonce" value="([^"]+)".*', re.M | re.S)
+LINK_MARKUP_PARSE = re.compile("\[([^\]]+)\]\(([^)]+)\)")
+
+class Message:
+  def __init__(self, client, data):
+    self.client = client
+    self.account = client.account
+    self.protocol = client.account["protocol"]
+    self.username = client.account["username"]
+    if "id" in data: self.id = data["id"]
+    self.sender = "%s %s" % (data["user"]["first_name"], data["user"]["last_name"])
+    self.sender_nick = data["user"]["nick"]
+    self.sender_id = data["user"]["nick"]
+
+    # Jaiku's timestamp format is lousy
+    d, t = data["created_at"].split("T")
+    self.time = support.parse_time(d + t.replace("-", ":"))
+
+    self.text = ""
+    if "title" in data:
+      self.text = data["title"]
+      #self.html_string = LINK_MARKUP_PARSE.sub('<a href="\\2">\\1</a>', self.text.replace(
+      #  "&", "&amp;").replace("<", "&lt;").replace(">", "&gt;"))
+    self.image = data["user"]["avatar"]
+    self.bgcolor = "message_color"
+    self.url = data["url"]
+    self.profile_url = "http://%s.jaiku.com" % data["user"]["nick"]
+    if "icon" in data and data["icon"] != "": self.icon = data["icon"]
+    self.can_thread = True
+    self.is_reply = (re.compile("@%s[\W]+|@%s$" % (self.username, self.username)).search(self.text) != None) or \
+      (urlparse.urlparse(self.url)[1].split(".")[0].strip() == self.username and \
+        self.sender_nick != self.username)
+
+class Comment(Message):
+  def __init__(self, client, data):
+    Message.__init__(self, client, data)
+    self.text = data["content"]
+    self.bgcolor = "comment_color"
+    self.is_comment = True
+
+    self.text = data["content"]
+    #self.html_string = support.LINK_PARSE.sub('<a href="\\1">\\1</a>', LINK_MARKUP_PARSE.sub('<a href="\\2">\\1</a>', self.text.replace(
+    #  "&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")))
+
+    if "entry_title" in data:
+      self.original_title = data["entry_title"]
+      self.title = "<small>Comment by</small> %s <small>on %s</small>" % (
+        self.sender, support.truncate(data["entry_title"],
+          client.account["comment_title_length"] or 20))
+
+    if "comment_id" in data:
+      self.id = data["comment_id"]
+    else: self.id = data["id"]
+
+class Client:
+  def __init__(self, acct):
+    self.account = acct
+
+  def send_enabled(self):
+    return self.account["send_enabled"] and \
+      self.account["username"] != None and \
+      self.account["private:password"] != None
+
+  def receive_enabled(self):
+    return self.account["receive_enabled"] and \
+      self.account["username"] != None and \
+      self.account["private:password"] != None
+
+  def get_messages(self):
+    return simplejson.loads(urllib2.urlopen(urllib2.Request(
+      "http://%s.jaiku.com/contacts/feed/json" % self.account["username"],
+        urllib.urlencode({"user": self.account["username"],
+          "personal_key":self.account["private:password"]}))).read())
+
+  def get_thread_data(self, msg):
+    return simplejson.loads(urllib2.urlopen(urllib2.Request(
+      "%s/json" % ("#" in msg.url and msg.url.split("#")[0] or msg.url),
+        urllib.urlencode({"user": self.account["username"],
+          "personal_key":self.account["private:password"]}))).read())
+
+  def thread(self, msg):
+    thread_content = self.get_thread_data(msg)
+    yield Message(self, thread_content)
+    for data in thread_content["comments"]:
+      yield Comment(self, data)
+
+  def receive(self):
+    for data in self.get_messages()["stream"]:
+      if "id" in data: yield Message(self, data)
+      else: yield Comment(self, data)
+
+  def send_thread(self, message, target):
+    print urllib2.urlopen(urllib2.Request("http://api.jaiku.com/json",
+      urllib.urlencode({
+        "method": "entry_add_comment",
+        "user": self.account["username"],
+        "personal_key":self.account["private:password"],
+        "stream": "stream/[e-mail]/comments" % self.account["username"],
+        "entry": "stream/[e-mail]/presence/%s" % (target.sender_nick, target.id),
+        "nick": "[e-mail]" % self.account["username"],
+        "content": message
+      }))).read()
+
+  def send(self, message):
+    urllib2.urlopen(urllib2.Request(
+      "http://api.jaiku.com/json", urllib.urlencode({"user": self.account["username"],
+      "personal_key":self.account["private:password"],
+      "message": message, "method": "presence.send"}))).read()
+

=== added file 'gwibber/microblog/laconica.py'
--- gwibber/microblog/laconica.py	1970-01-01 00:00:00 +0000
+++ gwibber/microblog/laconica.py	2010-02-11 10:03:14 +0000
@@ -0,0 +1,219 @@
+
+
+"""
+
+Laconi.ca interface for Gwibber
+SegPhault (Ryan Paul) - 11/15/2008
+
+"""
+
+from . import support
+import urllib2, urllib, base64, re, simplejson, feedparser
+