Merge lp:~nbdarvin/awn-extras/pidgin-adium into lp:awn-extras

[Sergey Klimov]

pidgin-adium applet

[Michal Hruby (mhr3)]

There seems to be something wrong with the branches, could you stop by at #awn on irc.freenode.net?

[Sergey Klimov (nbdarvin)]

oh it seems that https://code.launchpad.net/~nbdarvin/awn-extras/jpilot-calendar needs to be merge first

[lp:~nbdarvin/awn-extras/pidgin-adium]

1306. By nbarvin on 2010-05-03

removed calendar-jpilot modifications

[Mark Lee (malept)]

There's still a calendar modification in this branch.

review: Needs Fixing

[Mark Lee (malept)]

I'd personally prefer that there's only one of these dock icon packs in bzr (as it seems to be fairly easy to get adium dock icons).

The license for the icons needs to be documented somewhere.

You probably want to get rid of all of the debug prints.

The whole "import pygtk; pygtk.require('2.0')" idiom is a bit obsolete; you can get rid of it.

I've only taken a cursory look, but does this applet have a contingency for the case where pidgin isn't running?

Could someone check to see if this is PEP8 compliant?

review: Needs Fixing

[Sergey Klimov (nbdarvin)]

> I'd personally prefer that there's only one of these dock icon packs in bzr
> (as it seems to be fairly easy to get adium dock icons).
>
> The license for the icons needs to be documented somewhere.
>
> You probably want to get rid of all of the debug prints.
>
> The whole "import pygtk; pygtk.require('2.0')" idiom is a bit obsolete; you
> can get rid of it.
>
> I've only taken a cursory look, but does this applet have a contingency for
> the case where pidgin isn't running?
>
> Could someone check to see if this is PEP8 compliant?

excuse me for such dirty code, i was not hope that you will react so rapidly. at end of week code will clean

[lp:~nbdarvin/awn-extras/pidgin-adium]

1307. By nbarvin on 2010-05-03

true adium theme support (without any convertion, full animation/overlay support)

1308. By nbarvin on 2010-05-03

remove temp files

1309. By nbarvin on 2010-05-03

some changes

[Sergey Klimov (nbdarvin)]

> I'd personally prefer that there's only one of these dock icon packs in bzr
> (as it seems to be fairly easy to get adium dock icons).
no, adium icon themes use its own iconpack format with some features like custom animations and overlays, its described in plist for adium icon theme. there millions of adium themes at http://www.adiumxtras.com/index.php?a=search&cat_id=1
> The license for the icons needs to be documented somewhere.
documented now
> You probably want to get rid of all of the debug prints.
almost done, development not completed
> The whole "import pygtk; pygtk.require('2.0')" idiom is a bit obsolete; you
> can get rid of it.
done
> I've only taken a cursory look, but does this applet have a contingency for
> the case where pidgin isn't running?
done
> Could someone check to see if this is PEP8 compliant?
done

[Sergey Klimov (nbdarvin)]

now removed all print debugs, please merge!

[Mark Lee (malept)]

> There's still a calendar modification in this branch.

This is still here...(which should really go in its own bug, as I mentioned elsewhere).

review: Needs Fixing

[Sergey Klimov (nbdarvin)]

> > There's still a calendar modification in this branch.
>
> This is still here...(which should really go in its own bug, as I mentioned
> elsewhere).
its deleted, it isn't?

[Mark Lee (malept)]

> > I'd personally prefer that there's only one of these dock icon packs in bzr
> > (as it seems to be fairly easy to get adium dock icons).
> no, adium icon themes use its own iconpack format with some features like
> custom animations and overlays, its described in plist for adium icon theme.
> there millions of adium themes at
> http://www.adiumxtras.com/index.php?a=search&cat_id=1

What I was trying to say was I don't know why you're bundling 8 icon themes, when you can download lots of them from the URL you quoted.

> > The license for the icons needs to be documented somewhere.
> documented now

Where, exactly? I didn't see it in a cursory look.

review: Needs Information

[lp:~nbdarvin/awn-extras/pidgin-adium]

1310. By nbarvin on 2010-05-04

popup menu delete ((

1311. By nbarvin on 2010-05-04

pep8 compliance, delete additional themes, license for themes

1312. By nbarvin on 2010-05-04

fix for search running pidgin instance

1313. By nbarvin on 2010-05-04

remove debug prints

[Sergey Klimov (nbdarvin)]

> > > I'd personally prefer that there's only one of these dock icon packs in
> bzr
> > > (as it seems to be fairly easy to get adium dock icons).
> > no, adium icon themes use its own iconpack format with some features like
> > custom animations and overlays, its described in plist for adium icon theme.
> > there millions of adium themes at
> > http://www.adiumxtras.com/index.php?a=search&cat_id=1
>
> What I was trying to say was I don't know why you're bundling 8 icon themes,
> when you can download lots of them from the URL you quoted.
some themes for example of use
>
> > > The license for the icons needs to be documented somewhere.
> > documented now
>
> Where, exactly? I didn't see it in a cursory look.

http://bazaar.launchpad.net/~nbdarvin/awn-extras/pidgin-adium/annotate/head%3A/applets/maintained/pidgin-adium/adium-dock-themes/README.themes

[Mark Lee (malept)]

> > > > I'd personally prefer that there's only one of these dock icon packs in
> > bzr
> > > > (as it seems to be fairly easy to get adium dock icons).
> > > no, adium icon themes use its own iconpack format with some features like
> > > custom animations and overlays, its described in plist for adium icon
> theme.
> > > there millions of adium themes at
> > > http://www.adiumxtras.com/index.php?a=search&cat_id=1
> >
> > What I was trying to say was I don't know why you're bundling 8 icon themes,
> > when you can download lots of them from the URL you quoted.
> some themes for example of use

You don't need *eight* examples though, right?

> >
> > > > The license for the icons needs to be documented somewhere.
> > > documented now
> >
> > Where, exactly? I didn't see it in a cursory look.
>
> http://bazaar.launchpad.net/~nbdarvin/awn-extras/pidgin-
> adium/annotate/head%3A/applets/maintained/pidgin-adium/adium-dock-
> themes/README.themes

The readme says that it's GPL-3, but <http://hg.adium.im/adium/file/d60e3dc89642/License.txt> says GPL-2 or later...

review: Needs Fixing

[Sergey Klimov (nbdarvin)]

oh, ok

2010/5/5 Mark Lee <email address hidden>

> Review: Needs Fixing
> > > > > I'd personally prefer that there's only one of these dock icon
> packs in
> > > bzr
> > > > > (as it seems to be fairly easy to get adium dock icons).
> > > > no, adium icon themes use its own iconpack format with some features
> like
> > > > custom animations and overlays, its described in plist for adium icon
> > theme.
> > > > there millions of adium themes at
> > > > http://www.adiumxtras.com/index.php?a=search&cat_id=1
> > >
> > > What I was trying to say was I don't know why you're bundling 8 icon
> themes,
> > > when you can download lots of them from the URL you quoted.
> > some themes for example of use
>
> You don't need *eight* examples though, right?
>
> > >
> > > > > The license for the icons needs to be documented somewhere.
> > > > documented now
> > >
> > > Where, exactly? I didn't see it in a cursory look.
> >
> > http://bazaar.launchpad.net/~nbdarvin/awn-extras/pidgin-<http://bazaar.launchpad.net/%7Enbdarvin/awn-extras/pidgin->
> > adium/annotate/head%3A/applets/maintained/pidgin-adium/adium-dock-
> > themes/README.themes
>
> The readme says that it's GPL-3, but <
> http://hg.adium.im/adium/file/d60e3dc89642/License.txt> says GPL-2 or
> later...
> --
> https://code.launchpad.net/~nbdarvin/awn-extras/pidgin-adium/+merge/24594<https://code.launchpad.net/%7Enbdarvin/awn-extras/pidgin-adium/+merge/24594>
> You are the owner of lp:~nbdarvin/awn-extras/pidgin-adium.
>

[Mark Lee (malept)]

> > > There's still a calendar modification in this branch.
> >
> > This is still here...(which should really go in its own bug, as I mentioned
> > elsewhere).
> its deleted, it isn't?

Nope, this is what I get when I run a preview merge:

=== modified file 'applets/maintained/calendar/clockcal.py'

review: Needs Fixing

[lp:~nbdarvin/awn-extras/pidgin-adium]

1314. By nbarvin on 2010-05-05

removed themes, new themes license file

1315. By nbarvin on 2010-05-05

removed clokccalpy modification

[Mark Lee (malept)]

I've taken another pass at this, and here's what I've noticed:

 * you only need the GPL part of that license.txt file - the rest isn't applicable. In fact, README.themes just needs to say something like "The icon themes bundled with this applet were copied from Adium, which is licensed under the GPL version 2 (or later). See LICENSE.GPL2 for the full text."

 * this applet seems to require Python 2.6 or later (as that's when plistlib was made available for non-Mac platforms, according to the docs).

 * There still seems to be some debug functions hanging around? (For example, pidgindbus.Connecting())

review: Needs Fixing

[lp:~nbdarvin/awn-extras/pidgin-adium]

1316. By nbarvin on 2010-05-06

LICENSE

[Sergey Klimov (nbdarvin)]

fixed, yes, plistlib need - should i bundle it to applet?

2010/5/6 Mark Lee <email address hidden>

> Review: Needs Fixing
> I've taken another pass at this, and here's what I've noticed:
>
> * you only need the GPL part of that license.txt file - the rest isn't
> applicable. In fact, README.themes just needs to say something like "The
> icon themes bundled with this applet were copied from Adium, which is
> licensed under the GPL version 2 (or later). See LICENSE.GPL2 for the full
> text."
>
> * this applet seems to require Python 2.6 or later (as that's when
> plistlib was made available for non-Mac platforms, according to the docs).
>
> * There still seems to be some debug functions hanging around? (For
> example, pidgindbus.Connecting())
> --
> https://code.launchpad.net/~nbdarvin/awn-extras/pidgin-adium/+merge/24594<https://code.launchpad.net/%7Enbdarvin/awn-extras/pidgin-adium/+merge/24594>
> You are the owner of lp:~nbdarvin/awn-extras/pidgin-adium.
>

[lp:~nbdarvin/awn-extras/pidgin-adium]

1317. By nbarvin on 2010-05-06

removed print debugs

[onox (onox)]

== Disclaimer ==
Written around 5 am using a crappy internet connection.

== 1 ==
In setup_dialog_settings() you seem to use an old way to initialize the theme setting. I only took a quick look at the code, but if you have a .ui (GtkBuilder) file, then you can use:

binder = self.applet.settings.get_binder(prefs)
binder.bind("theme", "combobox-theme", key_callback=self.combobox_theme_changed_cb)
self.applet.settings.load_bindings(binder)

prefs is a gtk.Builder object here. You can then use self.applet.settings["theme"] or use the GProps object returned by load_bindings(); if you choose this, use it something like this:

self.settings = self.applet.settings.load_bindings(binder)

And then you should be able to use it like this: print self.settings.theme or self.settings.theme = "Tango" to read or write the setting.

In this case you need to create the combobox in the .ui file (not manually) with a model (GtkListStore) that needs a gchararray field/column. Then after having set-up the bindings, you need to fill the combobox with some text elements:

combobox_theme = prefs.get_object("combobox-theme")
awnlib.add_cell_renderer_text(combobox_theme)
for i in self.themes:
    combobox_theme.append_text(i)

self.themes is a list of strings here. Note that a call to add a cell renderer is needed, because the Glade tool doesn't seem to provide a way to set it in the .ui file.

Look in load_theme_pref() in volume-control.py how you could do this.

== 2 ==
I also noticed that you seem to set pixbufs as icons via self.applet.icon.set(). I think it's better to use Awn's themed icon API (moonbeam will agree :p) if possible. To do this, when initializing the icons (see setup_icons() in volume-control.py), first set the states:

self.applet.theme.set_states(states)

where states is a dict mapping the state names to the icon names. Second, you set the theme:

self.applet.theme.theme(theme)

theme must be None here if you want to use the user's current system theme. (In volume-control.py in setup_icons() I add "System theme" to the combobox, and then make theme None if the theme name matches "System theme")

Later, when you want to change the icon, set the icon to one of the states that you gave set_states():

self.applet.theme.icon(icon_state)

I call the setup_icons() method every time the combobox (theme) value changes. After that, you can change the icon (by changing the current state) whenever you want.

Btw, you need to change the folder adium-dock-themes/ to themes/ then. Also make sure Green/ and Purple/ both have each an index.theme file. And probably the images need to be in some directory with a famous/known name to get the bloody gtk icon code (used by the Awn themed icon API) to find the images. (I use themes/<theme name>/scalable/

If you use this themed icon API shizzle, then you can remove the call self.applet.connect_size_changed(self.size_changed_cb)

== 3 ==
Oh, and use if x is None (or if x) instead of if x == None
and if x is not None (or if not x) instead of if x != None

== 4 ==
Last thing: you seem to do

self.popup_menu = self.applet.create_default_menu()
self.popup_menu.show_all()

in setup_context_menu(). Don't do this, you can just ...

[onox (onox)]

Small mistake :p

== 3 ==
Oh, and use if x is None (or if not x) instead of if x == None
and if x is not None (or if x) instead of if x != None

Unmerged revisions

1317. By nbarvin on 2010-05-06

removed print debugs

1316. By nbarvin on 2010-05-06

LICENSE

1315. By nbarvin on 2010-05-05

removed clokccalpy modification

1314. By nbarvin on 2010-05-05

removed themes, new themes license file

1313. By nbarvin on 2010-05-04

remove debug prints

1312. By nbarvin on 2010-05-04

fix for search running pidgin instance

1311. By nbarvin on 2010-05-04

pep8 compliance, delete additional themes, license for themes

1310. By nbarvin on 2010-05-04

popup menu delete ((

1309. By nbarvin on 2010-05-03

some changes

1308. By nbarvin on 2010-05-03

remove temp files

=== added directory 'applets/maintained/pidgin-adium'
=== added directory 'applets/maintained/pidgin-adium/adium-dock-themes'
=== added directory 'applets/maintained/pidgin-adium/adium-dock-themes/Green'
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Green/ApplicationIcon.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Green/ApplicationIcon.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Green/ApplicationIcon.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Green/Asleep.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Green/Asleep.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Green/Asleep.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Green/Awake.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Green/Awake.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Green/Awake.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Green/Flap.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Green/Flap.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Green/Flap.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Green/IconPack.plist'
--- applets/maintained/pidgin-adium/adium-dock-themes/Green/IconPack.plist	1970-01-01 00:00:00 +0000
+++ applets/maintained/pidgin-adium/adium-dock-themes/Green/IconPack.plist	2010-05-06 10:16:27 +0000
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Description</key>
+	<dict>
+		<key>Creator</key>
+		<string>Created by Adam Betts</string>
+		<key>LinkURL</key>
+		<string>http://www.artofadambetts.com/</string>
+		<key>Title</key>
+		<string>Adiumy Green</string>
+	</dict>
+	<key>State</key>
+	<dict>
+		<key>Invisible</key>
+		<dict>
+			<key>Overlay</key>
+			<false/>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>Invisible.png</string>
+		</dict>
+		<key>InvisibleAlert</key>
+		<dict>
+			<key>Animated</key>
+			<true/>
+			<key>Images</key>
+			<array>
+				<string>InvisibleFlap.png</string>
+				<string>Invisible.png</string>
+			</array>
+			<key>Overlay</key>
+			<false/>
+			<key>Delay</key>
+			<real>0.5</real>
+		</dict>
+		<key>Alert</key>
+		<dict>
+			<key>Animated</key>
+			<true/>
+			<key>Delay</key>
+			<real>0.5</real>
+			<key>Images</key>
+			<array>
+				<string>Flap.png</string>
+				<string>Awake.png</string>
+			</array>
+			<key>Overlay</key>
+			<false/>
+		</dict>
+		<key>ApplicationIcon</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>ApplicationIcon.png</string>
+			<key>Overlay</key>
+			<false/>
+		</dict>
+		<key>Away</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>../Shared Images/Away.png</string>
+			<key>Overlay</key>
+			<true/>
+		</dict>
+		<key>Base</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>Asleep.png</string>
+			<key>Overlay</key>
+			<false/>
+		</dict>
+		<key>Connecting</key>
+		<dict>
+			<key>Animated</key>
+			<true/>
+			<key>Delay</key>
+			<real>0.2</real>
+			<key>Images</key>
+			<array>
+				<string>../Shared Images/Connect1.png</string>
+				<string>../Shared Images/Connect2.png</string>
+				<string>../Shared Images/Connect3.png</string>
+				<string>../Shared Images/Connect4.png</string>
+			</array>
+			<key>Overlay</key>
+			<true/>
+		</dict>
+		<key>Idle</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>../Shared Images/Idle.png</string>
+			<key>Overlay</key>
+			<true/>
+		</dict>
+		<key>Online</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>Awake.png</string>
+			<key>Overlay</key>
+			<false/>
+		</dict>
+		<key>Preview</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>Awake.png</string>
+			<key>Overlay</key>
+			<false/>
+		</dict>
+	</dict>
+</dict>
+</plist>
 
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Green/Invisible.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Green/Invisible.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Green/Invisible.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Green/InvisibleFlap.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Green/InvisibleFlap.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Green/InvisibleFlap.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Green/PidginDockIcon-Idle.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Green/PidginDockIcon-Idle.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Green/PidginDockIcon-Idle.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/LICENSE.GPL2'
--- applets/maintained/pidgin-adium/adium-dock-themes/LICENSE.GPL2	1970-01-01 00:00:00 +0000
+++ applets/maintained/pidgin-adium/adium-dock-themes/LICENSE.GPL2	2010-05-06 10:16:27 +0000
@@ -0,0 +1,390 @@
+--------------------------------------------------------------------
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  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 Library 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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 Library General
+Public License instead of this License.
+
+--------------------------------------------------------------------------------
+Adium uses libezv by Andrew Wellington, which is distributed under the
+following license:
+
+Libezv 
+Copyright (c) 2004 Andrew Wellington. 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this 
+list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimer in the documentation and/or 
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED 
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+OF SUCH DAMAGE.
+--------------------------------------------------------------------------------
+Adium uses zhm, the Zephyr Host Manager, alongside libpurple to provide Zephyr
+connectivity. It is distributed under the MIT License as follows:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 \ No newline at end of file
 
=== added directory 'applets/maintained/pidgin-adium/adium-dock-themes/Purple'
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Purple/ApplicationIcon.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Purple/ApplicationIcon.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Purple/ApplicationIcon.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Purple/Asleep.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Purple/Asleep.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Purple/Asleep.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Purple/Awake.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Purple/Awake.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Purple/Awake.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Purple/Flap.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Purple/Flap.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Purple/Flap.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Purple/IconPack.plist'
--- applets/maintained/pidgin-adium/adium-dock-themes/Purple/IconPack.plist	1970-01-01 00:00:00 +0000
+++ applets/maintained/pidgin-adium/adium-dock-themes/Purple/IconPack.plist	2010-05-06 10:16:27 +0000
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Description</key>
+	<dict>
+		<key>Creator</key>
+		<string>Created by Adam Betts</string>
+		<key>LinkURL</key>
+		<string>http://www.artofadambetts.com/</string>
+		<key>Title</key>
+		<string>Adiumy Purple</string>
+	</dict>
+	<key>State</key>
+	<dict>
+		<key>Invisible</key>
+		<dict>
+			<key>Overlay</key>
+			<false/>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>Invisible.png</string>
+		</dict>
+		<key>InvisibleAlert</key>
+		<dict>
+			<key>Animated</key>
+			<true/>
+			<key>Images</key>
+			<array>
+				<string>InvisibleFlap.png</string>
+				<string>Invisible.png</string>
+			</array>
+			<key>Overlay</key>
+			<false/>
+			<key>Delay</key>
+			<real>0.5</real>
+		</dict>
+		<key>Alert</key>
+		<dict>
+			<key>Animated</key>
+			<true/>
+			<key>Delay</key>
+			<real>0.5</real>
+			<key>Images</key>
+			<array>
+				<string>Flap.png</string>
+				<string>Awake.png</string>
+			</array>
+			<key>Overlay</key>
+			<false/>
+		</dict>
+		<key>ApplicationIcon</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>ApplicationIcon.png</string>
+			<key>Overlay</key>
+			<false/>
+		</dict>
+		<key>Away</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>../Shared Images/Away.png</string>
+			<key>Overlay</key>
+			<true/>
+		</dict>
+		<key>Base</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>Asleep.png</string>
+			<key>Overlay</key>
+			<false/>
+		</dict>
+		<key>Connecting</key>
+		<dict>
+			<key>Animated</key>
+			<true/>
+			<key>Delay</key>
+			<real>0.2</real>
+			<key>Images</key>
+			<array>
+				<string>../Shared Images/Connect1.png</string>
+				<string>../Shared Images/Connect2.png</string>
+				<string>../Shared Images/Connect3.png</string>
+				<string>../Shared Images/Connect4.png</string>
+			</array>
+			<key>Overlay</key>
+			<true/>
+		</dict>
+		<key>Idle</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>../Shared Images/Idle.png</string>
+			<key>Overlay</key>
+			<true/>
+		</dict>
+		<key>Online</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>Awake.png</string>
+			<key>Overlay</key>
+			<false/>
+		</dict>
+		<key>Preview</key>
+		<dict>
+			<key>Animated</key>
+			<false/>
+			<key>Image</key>
+			<string>Awake.png</string>
+			<key>Overlay</key>
+			<false/>
+		</dict>
+	</dict>
+</dict>
+</plist>
 
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Purple/Invisible.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Purple/Invisible.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Purple/Invisible.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Purple/InvisibleFlap.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Purple/InvisibleFlap.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Purple/InvisibleFlap.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Purple/__temp-for-pidgin-only-Asleep.png_and_Away.png.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Purple/__temp-for-pidgin-only-Asleep.png_and_Away.png.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Purple/__temp-for-pidgin-only-Asleep.png_and_Away.png.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Purple/__temp-for-pidgin-only-Asleep.png_and_Idle.png.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Purple/__temp-for-pidgin-only-Asleep.png_and_Idle.png.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Purple/__temp-for-pidgin-only-Asleep.png_and_Idle.png.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/README.themes'
--- applets/maintained/pidgin-adium/adium-dock-themes/README.themes	1970-01-01 00:00:00 +0000
+++ applets/maintained/pidgin-adium/adium-dock-themes/README.themes	2010-05-06 10:16:27 +0000
@@ -0,0 +1,3 @@
+The icon themes bundled with this applet were copied from Adium, which 
+is licensed under the GPL version 2 (or later). See LICENSE.GPL2 for 
+the full text
 
=== added directory 'applets/maintained/pidgin-adium/adium-dock-themes/Shared Images'
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Away.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Away.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Away.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect1.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect1.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect1.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect2.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect2.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect2.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect3.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect3.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect3.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect4.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect4.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Connect4.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Idle.png'
 Binary files applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Idle.png	1970-01-01 00:00:00 +0000 and applets/maintained/pidgin-adium/adium-dock-themes/Shared Images/Idle.png	2010-05-06 10:16:27 +0000 differ
=== added file 'applets/maintained/pidgin-adium/adiumicontheme.py'
--- applets/maintained/pidgin-adium/adiumicontheme.py	1970-01-01 00:00:00 +0000
+++ applets/maintained/pidgin-adium/adiumicontheme.py	2010-05-06 10:16:27 +0000
@@ -0,0 +1,82 @@
+# Copyright (C) 2010  Sergey Klimov <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2 of the License.
+#
+# 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/>.
+
+import plistlib
+import os
+import itertools
+
+
+class AdiumIconSetter(object):
+
+    def __init__(self, themedir, setup_timeout_function, start_timer_function,\
+                  stop_timer_function, setup_icon_function):
+        self.themedirname = themedir
+        self.setup_timeout_function, self.start_timer_function, \
+            self.stop_timer_function, self.setup_icon_function = \
+            setup_timeout_function, start_timer_function,\
+            stop_timer_function, setup_icon_function
+        try:
+            self.theme = plistlib.readPlist(self.themedir("IconPack.plist"))
+        except:
+            self.theme = plistlib.readPlist(self.themedir("Info.plist"))
+
+        self.name = self.theme["Description"]["Title"]
+        self.author = self.theme["Description"]["Creator"]
+        self.status = None
+
+    def themedir(self, filename):
+        return os.path.join(self.themedirname, filename)
+
+    def get_filename_overlayed_image(self, imagebase, imageoverlay):
+        filename = self.themedir("__temp-for-pidgin-only-" + \
+                                 os.path.basename(imagebase)\
+                                 + "_and_" + os.path.basename(imageoverlay) \
+                                 + ".png")
+        if not os.path.isfile(filename):
+            import Image
+            ###online or Base?..
+            base = Image.open(self.themedir(imagebase)).convert('RGBA')
+            overlay = Image.open(self.themedir(imageoverlay)).convert('RGBA')
+            resultimage = Image.composite(overlay, base, overlay)
+            resultimage.save(filename)
+        return filename
+
+    def timeout_cb(self):
+        if self.theme["State"][self.status]["Overlay"]:
+            self.setup_icon_function_overlay(self.animateframes.next())
+        else:
+            self.setup_icon_function(self.animateframes.next())
+
+    def setup_icon_function_overlay(self, icon):
+        self.setup_icon_function(\
+            self.get_filename_overlayed_image(\
+            self.theme["State"]["Base"]["Image"], icon))
+
+    def set_status(self, status):
+        if self.status != status:
+            self.status = status
+            if self.theme["State"][status]["Animated"]:
+                self.setup_timeout_function(\
+                            self.theme["State"][status]["Delay"])
+                self.animateframes = itertools.cycle(\
+                                    self.theme["State"][status]["Images"])
+                self.start_timer_function()
+            else:
+                self.stop_timer_function()
+                if self.theme["State"][status]["Overlay"]:
+                    self.setup_icon_function_overlay(\
+                            self.theme["State"][status]["Image"])
+                else:
+                    self.setup_icon_function(\
+                            self.theme["State"][status]["Image"])
 
=== added file 'applets/maintained/pidgin-adium/pidgin-adium.py'
--- applets/maintained/pidgin-adium/pidgin-adium.py	1970-01-01 00:00:00 +0000
+++ applets/maintained/pidgin-adium/pidgin-adium.py	2010-05-06 10:16:27 +0000
@@ -0,0 +1,232 @@
+# Copyright (C) 2010  Sergey Klimov <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2 of the License.
+#
+# 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/>.
+
+# Here some imports like re, os, sys, etc.
+import os
+import gtk
+import gtk.gdk
+
+from awn.extras import awnlib
+
+import pidgindbus
+import adiumicontheme
+import subprocess
+
+applet_name = "Pidgin-Adium dock"
+applet_version = "0.0.5"
+applet_description = """An applet that place pidgin-status icon with animated \
+Adium theme to doc"""
+
+applet_logo = os.path.join(os.path.dirname(__file__), \
+                           "adium-dock-themes/Green/Asleep.png")
+
+STATUS_TYPES = (('__this status not exist__', 'This icon do not exist', \
+                        'This icon do not exist'), \
+                ('offline', 'Base'), \
+                ('online', 'Online'), \
+                ('unavailable', 'Idle'), \
+                ('invisible', 'Invisible'), \
+                ('away', 'Away'), \
+                ('extended away', 'Away'), \
+                ('mobile', 'Online'), \
+                ('tune', 'Preview'))
+
+
+class PidginAdiumApplet:
+    """ An applet that shows pidgin status with adium themes icon """
+
+    def __init__(self, applet):
+        self.applet = applet
+        self.connect_to_pidgin()
+
+        self.update_animation = self.applet.timing.register(\
+                                        self.update_animation_cb, 3, False)
+        self.pidgin_istance_search_timer = self.applet.timing.register(\
+                                        self.pidgin_istance_search_timer_cb, \
+                                        0.5, True)
+
+        self.atheme = adiumicontheme.AdiumIconSetter(\
+                os.path.join(self.get_path_to_themes(), \
+                             self.get_current_theme_name()), \
+                             self.update_animation.change_interval, \
+                             self.update_animation.start,\
+                             self.update_animation.stop, self.setup_icon)
+        self.active = False
+        self.RefreshIcon()
+        self.setup_context_menu()
+
+        self.applet.connect_size_changed(self.size_changed_cb)
+
+        self.RefreshIcon()
+        self.applet.connect("clicked", self.clicked_cb)
+
+    def clicked_cb(self, date):
+        subprocess.Popen('pidgin', shell=True)
+        if self.pidgin == None:
+            self.pidgin_istance_search_timer.start()
+
+    def pidgin_istance_search_timer_cb(self):
+        self.connect_to_pidgin()
+        if self.pidgin != None:
+            self.pidgin_istance_search_timer.stop()
+        self.RefreshIcon()
+
+    def connect_to_pidgin(self):
+        try:
+            self.pidgin = pidgindbus.Pidgin(self.message_recieve_handler, \
+                                self.status_changed_handler, \
+                                self.message_readed_handler, \
+                                self.connecting_handler, \
+                                self.signed_on_handler)
+        except:
+            self.pidgin = None
+
+    def update_animation_cb(self):
+        self.atheme.timeout_cb()
+
+    def setup_dialog_settings(self, vbox):
+        """Load the settings.
+
+        """
+        if "theme" not in self.applet.settings:
+            self.applet.settings["theme"] = "Green"
+        self.theme_setting = self.applet.settings["theme"]
+
+        combobox = gtk.combo_box_new_text()
+
+        combobox.connect('changed', self.changed_theme_cb)
+
+        directory = self.get_path_to_themes()
+        for f in os.listdir(directory):
+            if os.path.isfile(os.path.join(directory, f)):
+                pass
+            if os.path.isdir(os.path.join(directory, f)) and \
+                                (f != "Shared Images"):
+                combobox.append_text(f)
+
+        def set_active_text(combobox, text):
+            model = combobox.get_model()
+            for i, item in enumerate(model):
+                if item[0] == text:
+                    combobox.set_active(i)
+                    break
+
+        set_active_text(combobox, self.applet.settings["theme"])
+        vbox.pack_start(gtk.Label("Select Adium theme for dock: \n \
+(themes must be placed at ~/.config/awn/pidgin-adium/adium-dock-themes)\n \
+You can download themes at \n \
+http://www.adiumxtras.com/index.php?a=search&cat_id=1"))
+        vbox.pack_start(combobox)
+
+    def changed_theme_cb(self, combobox):
+        model = combobox.get_model()
+        index = combobox.get_active()
+        if index:
+            self.applet.settings["theme"] = model[index][0]
+            self.atheme = adiumicontheme.AdiumIconSetter(\
+                os.path.join(self.get_path_to_themes(),\
+                             self.get_current_theme_name()), \
+                             self.update_animation.change_interval, \
+                             self.update_animation.start,\
+                             self.update_animation.stop, self.setup_icon)
+            self.RefreshIcon()
+        return
+
+    def setup_context_menu(self):
+        pref_dialog = self.applet.dialog.new("preferences")
+
+        self.setup_dialog_settings(pref_dialog.vbox)
+
+        self.popup_menu = self.applet.create_default_menu()
+        for i, status in enumerate(STATUS_TYPES):
+            menuitem = gtk.MenuItem(status[0])
+            self.popup_menu.append(menuitem)
+            menuitem.show()
+            menuitem.connect("activate", self.status_menu_activate_cb, i)
+        self.popup_menu.show_all()
+
+    def status_menu_activate_cb(self, numstatus):
+        print STATUS_TYPES[numstatus]
+
+    def size_changed_cb(self):
+        self.RefreshIcon()
+
+    def set_tooltip(self, tooltip):
+        self.applet.tooltip.set(tooltip)
+
+    def setup_icon(self, iconname):
+        iconw = self.applet.get_size()
+        icon = gtk.gdk.pixbuf_new_from_file_at_size(\
+                            os.path.join(self.get_path_to_themes(),\
+                            self.get_current_theme_name(), iconname),\
+                            iconw, iconw)
+        self.applet.icon.set(icon)
+
+    def set_status(self):
+        if self.pidgin != None:
+            self.status = self.pidgin.GetStatus()
+            self.active = (self.pidgin.GetUnreadMessagesNum() != 0)
+            self.old_active = self.active
+            self.tooltip = STATUS_TYPES[self.status][0]
+            if self.active:
+                self.tooltip += " (%s)" % self.pidgin.GetUnreadMessagesNum()
+                if self.status == 4: #InvisibleAlert
+                    self.atheme.set_status("InvisibleAlert")
+                else:
+                    self.atheme.set_status("Alert")
+            else:
+                self.atheme.set_status(STATUS_TYPES[self.status][1])
+        else:
+            self.tooltip = "Pidgin not running. Click to run Pidgin"
+            self.atheme.set_status("Base")
+
+    def RefreshIcon(self, **args):
+        self.set_status()
+        self.set_tooltip(self.tooltip)
+
+    def get_path_to_themes(self):
+        return os.path.join(os.path.dirname(__file__), "adium-dock-themes")
+
+    def get_current_theme_name(self):
+        return self.applet.settings["theme"]
+
+    def message_recieve_handler(self, **args):
+        print ">>>>>>message from %s, '%s', total unread messages: %d" \
+                                    % (args['sender'], args['message'], \
+                                    args['unread'][0])
+        self.RefreshIcon()
+        #fixme:  args)
+
+    def status_changed_handler(self, **args):
+        self.RefreshIcon()
+
+    def message_readed_handler(self, **args):
+        self.RefreshIcon()
+
+    def connecting_handler(self, **args):
+        self.atheme.set_status("Connecting")
+
+    def signed_on_handler(self, **args):
+        self.RefreshIcon()
+
+
+if __name__ == "__main__":
+    awnlib.init_start(PidginAdiumApplet, {"name": applet_name,
+        "short": "pidgin-adium",
+        "version": applet_version,
+        "description": applet_description,
+        "theme": applet_logo,
+        "author": "Sergey Klimov",
+        "copyright-year": 2010,
+        "authors": ["Sergey Klimov <[e-mail]>"]})
 
=== added file 'applets/maintained/pidgin-adium/pidgindbus.py'
--- applets/maintained/pidgin-adium/pidgindbus.py	1970-01-01 00:00:00 +0000
+++ applets/maintained/pidgin-adium/pidgindbus.py	2010-05-06 10:16:27 +0000
@@ -0,0 +1,181 @@
+# Copyright (C) 2010  Sergey Klimov <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, version 2 of the License.
+#
+# 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/>.
+
+import gobject
+import os
+import sys
+import dbus
+from dbus.mainloop.glib import DBusGMainLoop
+
+
+def MessageRecieve(**args):
+    pass
+
+
+def StatusChanged(**args):
+    pass
+
+
+def MessageReaded(**args):
+    pass
+
+
+def Connecting(**args):
+    pass
+
+
+if __name__ == '__main__':
+    STATUS_TYPES = (('__this status not exist__', \
+                    'This icon do not exist', 'This icon do not exist'), \
+                ('offline', 'Asleep.png', 'This icon do not exist'), \
+                ('online', 'Awake.png', 'Flap.png'), \
+                ('unavailable', 'Invisible.png', 'InvisibleFlap.png'), \
+                ('invisible', 'Invisible.png', 'InvisibleFlap.png'), \
+                ('away', 'Invisible.png', 'InvisibleFlap.png'), \
+                ('extended away', 'Invisible.png', 'InvisibleFlap.png'), \
+                ('mobile', 'Awake.png', 'Flap.png'), \
+                ('tune', 'Awake.png', 'Flap.png'))
+
+
+class Pidgin(object):
+    """Class to communicate pidgin"""
+    STATUS = {'_notconnected_': 0,
+                'offline': 1,
+                'online': 2,
+                'unavailable': 3,
+                'invisible': 4,
+                'away': 5,
+                'extended away': 6,
+                'mobile': 7,
+                'tune': 8}
+
+    def __init__(self, message_recieve_handler, status_changed_handler,\
+                message_readed_handler, connecting_handler, signed_on_handler):
+        """
+        message_recieve_handler is function, have args: sender, account,
+        message, unread(tuple), status_changed_hanler - function with
+        status arg
+        """
+        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+        bus = dbus.SessionBus()
+        obj = bus.get_object("im.pidgin.purple.PurpleService", \
+                             "/im/pidgin/purple/PurpleObject")
+        self.__purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface")
+
+        #add event handlers
+        self.status_changed_handler = status_changed_handler
+        bus.add_signal_receiver(self.on_savedstatus_changed,
+                        dbus_interface="im.pidgin.purple.PurpleInterface",
+                        signal_name="SavedstatusChanged")
+
+        self.signed_on_handler = signed_on_handler
+        bus.add_signal_receiver(self.on_signed_on,
+                        dbus_interface="im.pidgin.purple.PurpleInterface",
+                        signal_name="SignedOn")
+
+        self.message_recieve_handler = message_recieve_handler
+        bus.add_signal_receiver(self.on_received_im_msg,
+                        dbus_interface="im.pidgin.purple.PurpleInterface",
+                        signal_name="ReceivedImMsg")
+
+
+        self.message_readed_handler = message_readed_handler
+        bus.add_signal_receiver(self.on_message_readed,
+                        dbus_interface="im.pidgin.purple.PurpleInterface",
+                        signal_name="ConversationUpdated")
+
+        self.connecting_handler = connecting_handler
+        bus.add_signal_receiver(self.on_connecting,
+                        dbus_interface="im.pidgin.purple.PurpleInterface",
+                        signal_name="AccountConnecting")
+
+    def on_savedstatus_changed(self, newstatus, oldstatus):
+        self.status_changed_handler()
+
+    def on_signed_on(self, conn):
+        self.signed_on_handler()
+
+    def on_message_readed(self, conv, type):
+        self.message_readed_handler()
+
+    def on_connecting(self, account):
+        self.connecting_handler(account=account)
+
+    def __detect_unread_conversations(self):
+        purple = self.__purple
+        im = True
+        chat = True
+        tooltip = ""
+        blink = False
+        allcount = 0
+        conversations = []
+        if im and chat:
+            convs = purple.PurpleGetConversations()
+        elif im:
+            convs = purple.PurpleGetIms()
+        elif chat:
+            convs = purple.PurpleGetChats()
+        else:
+            convs = None
+        for conv in convs:
+            count = purple.PurpleConversationGetData(conv, "unseen-count")
+            if count and count > 0:
+                blink = True
+                allcount += count
+                conversations.append(\
+                        {'name': purple.PurpleConversationGetName(conv),\
+                        'count': count})
+                tooltip = tooltip + "\n" + \
+                                purple.PurpleConversationGetName(conv) + \
+                                        " (" + str(count) + ")"
+        text_representation = tooltip
+        return (allcount, conversations,
+            text_representation)
+
+    def on_received_im_msg(self, account, sender, \
+                           message, conversation, flags):
+        self.message_recieve_handler(sender=sender, account=account, \
+                             message=message, \
+                             unread=self.__detect_unread_conversations())
+
+    def GetStatus(self):
+        """Gets current status"""
+        status = self.__purple.PurpleSavedstatusGetCurrent()
+        #get current status
+        status_type = self.__purple.PurpleSavedstatusGetType(status)
+        #get current status type
+        return status_type
+
+    def SetStatus(self, status):
+        """Sets status, status must be status name"""
+        st = self.__purple.PurpleSavedstatusGetCurrent()
+        self.__purple.PurpleSavedstatusSetType(st, self.STATUS[status])
+        self.__purple.PurpleSavedstatusActivate(st)
+
+    def GetUnreadMessages(self):
+        """Gets number of unread messages"""
+        return self.__detect_unread_conversations()
+
+    def GetUnreadMessagesNum(self):
+        """Gets number of unread messages"""
+        return self.__detect_unread_conversations()[0]
+
+
+if __name__ == '__main__':
+    p = Pidgin(MessageRecieve, StatusChanged, \
+               MessageReaded, Connecting, StatusChanged)
+    print p.GetStatus()
+    loop = gobject.MainLoop()
+    loop.run()