diff --git a/Core/__init__.py b/Core/__init__.py
deleted file mode 100644
index d93c168c8c58bf5c8c73baa8af1e3c8b5aadc8f1..0000000000000000000000000000000000000000
--- a/Core/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import core
diff --git a/common/__init__.py b/common/__init__.py
deleted file mode 100644
index 13882eebf5dc87690ff06399940b842334e8651f..0000000000000000000000000000000000000000
--- a/common/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import hub
-import jabber
-import plugin
-import xmlstream
diff --git a/plugins/gtkgui/emoticons/angry.png b/data/emoticons/angry.png
similarity index 100%
rename from plugins/gtkgui/emoticons/angry.png
rename to data/emoticons/angry.png
diff --git a/plugins/gtkgui/emoticons/bat.png b/data/emoticons/bat.png
similarity index 100%
rename from plugins/gtkgui/emoticons/bat.png
rename to data/emoticons/bat.png
diff --git a/plugins/gtkgui/emoticons/beer.png b/data/emoticons/beer.png
similarity index 100%
rename from plugins/gtkgui/emoticons/beer.png
rename to data/emoticons/beer.png
diff --git a/plugins/gtkgui/emoticons/biggrin.png b/data/emoticons/biggrin.png
similarity index 100%
rename from plugins/gtkgui/emoticons/biggrin.png
rename to data/emoticons/biggrin.png
diff --git a/plugins/gtkgui/emoticons/blush.png b/data/emoticons/blush.png
similarity index 100%
rename from plugins/gtkgui/emoticons/blush.png
rename to data/emoticons/blush.png
diff --git a/plugins/gtkgui/emoticons/boy.png b/data/emoticons/boy.png
similarity index 100%
rename from plugins/gtkgui/emoticons/boy.png
rename to data/emoticons/boy.png
diff --git a/plugins/gtkgui/emoticons/brflower.png b/data/emoticons/brflower.png
similarity index 100%
rename from plugins/gtkgui/emoticons/brflower.png
rename to data/emoticons/brflower.png
diff --git a/plugins/gtkgui/emoticons/brheart.png b/data/emoticons/brheart.png
similarity index 100%
rename from plugins/gtkgui/emoticons/brheart.png
rename to data/emoticons/brheart.png
diff --git a/plugins/gtkgui/emoticons/coffee.png b/data/emoticons/coffee.png
similarity index 100%
rename from plugins/gtkgui/emoticons/coffee.png
rename to data/emoticons/coffee.png
diff --git a/plugins/gtkgui/emoticons/coolglasses.png b/data/emoticons/coolglasses.png
similarity index 100%
rename from plugins/gtkgui/emoticons/coolglasses.png
rename to data/emoticons/coolglasses.png
diff --git a/plugins/gtkgui/emoticons/cry.png b/data/emoticons/cry.png
similarity index 100%
rename from plugins/gtkgui/emoticons/cry.png
rename to data/emoticons/cry.png
diff --git a/plugins/gtkgui/emoticons/cuffs.png b/data/emoticons/cuffs.png
similarity index 100%
rename from plugins/gtkgui/emoticons/cuffs.png
rename to data/emoticons/cuffs.png
diff --git a/plugins/gtkgui/emoticons/devil.png b/data/emoticons/devil.png
similarity index 100%
rename from plugins/gtkgui/emoticons/devil.png
rename to data/emoticons/devil.png
diff --git a/plugins/gtkgui/emoticons/drink.png b/data/emoticons/drink.png
similarity index 100%
rename from plugins/gtkgui/emoticons/drink.png
rename to data/emoticons/drink.png
diff --git a/plugins/gtkgui/emoticons/flower.png b/data/emoticons/flower.png
similarity index 100%
rename from plugins/gtkgui/emoticons/flower.png
rename to data/emoticons/flower.png
diff --git a/plugins/gtkgui/emoticons/frowning.png b/data/emoticons/frowning.png
similarity index 100%
rename from plugins/gtkgui/emoticons/frowning.png
rename to data/emoticons/frowning.png
diff --git a/plugins/gtkgui/emoticons/girl.png b/data/emoticons/girl.png
similarity index 100%
rename from plugins/gtkgui/emoticons/girl.png
rename to data/emoticons/girl.png
diff --git a/plugins/gtkgui/emoticons/heart.png b/data/emoticons/heart.png
similarity index 100%
rename from plugins/gtkgui/emoticons/heart.png
rename to data/emoticons/heart.png
diff --git a/plugins/gtkgui/emoticons/hugleft.png b/data/emoticons/hugleft.png
similarity index 100%
rename from plugins/gtkgui/emoticons/hugleft.png
rename to data/emoticons/hugleft.png
diff --git a/plugins/gtkgui/emoticons/hugright.png b/data/emoticons/hugright.png
similarity index 100%
rename from plugins/gtkgui/emoticons/hugright.png
rename to data/emoticons/hugright.png
diff --git a/plugins/gtkgui/emoticons/kiss.png b/data/emoticons/kiss.png
similarity index 100%
rename from plugins/gtkgui/emoticons/kiss.png
rename to data/emoticons/kiss.png
diff --git a/plugins/gtkgui/emoticons/lamp.png b/data/emoticons/lamp.png
similarity index 100%
rename from plugins/gtkgui/emoticons/lamp.png
rename to data/emoticons/lamp.png
diff --git a/plugins/gtkgui/emoticons/mail.png b/data/emoticons/mail.png
similarity index 100%
rename from plugins/gtkgui/emoticons/mail.png
rename to data/emoticons/mail.png
diff --git a/plugins/gtkgui/emoticons/moon.png b/data/emoticons/moon.png
similarity index 100%
rename from plugins/gtkgui/emoticons/moon.png
rename to data/emoticons/moon.png
diff --git a/plugins/gtkgui/emoticons/music.png b/data/emoticons/music.png
similarity index 100%
rename from plugins/gtkgui/emoticons/music.png
rename to data/emoticons/music.png
diff --git a/plugins/gtkgui/emoticons/no.png b/data/emoticons/no.png
similarity index 100%
rename from plugins/gtkgui/emoticons/no.png
rename to data/emoticons/no.png
diff --git a/plugins/gtkgui/emoticons/oh.png b/data/emoticons/oh.png
similarity index 100%
rename from plugins/gtkgui/emoticons/oh.png
rename to data/emoticons/oh.png
diff --git a/plugins/gtkgui/emoticons/phone.png b/data/emoticons/phone.png
similarity index 100%
rename from plugins/gtkgui/emoticons/phone.png
rename to data/emoticons/phone.png
diff --git a/plugins/gtkgui/emoticons/photo.png b/data/emoticons/photo.png
similarity index 100%
rename from plugins/gtkgui/emoticons/photo.png
rename to data/emoticons/photo.png
diff --git a/plugins/gtkgui/emoticons/pussy.png b/data/emoticons/pussy.png
similarity index 100%
rename from plugins/gtkgui/emoticons/pussy.png
rename to data/emoticons/pussy.png
diff --git a/plugins/gtkgui/emoticons/rainbow.png b/data/emoticons/rainbow.png
similarity index 100%
rename from plugins/gtkgui/emoticons/rainbow.png
rename to data/emoticons/rainbow.png
diff --git a/plugins/gtkgui/emoticons/smile.png b/data/emoticons/smile.png
similarity index 100%
rename from plugins/gtkgui/emoticons/smile.png
rename to data/emoticons/smile.png
diff --git a/plugins/gtkgui/emoticons/star.png b/data/emoticons/star.png
similarity index 100%
rename from plugins/gtkgui/emoticons/star.png
rename to data/emoticons/star.png
diff --git a/plugins/gtkgui/emoticons/stare.png b/data/emoticons/stare.png
similarity index 100%
rename from plugins/gtkgui/emoticons/stare.png
rename to data/emoticons/stare.png
diff --git a/plugins/gtkgui/emoticons/tongue.png b/data/emoticons/tongue.png
similarity index 100%
rename from plugins/gtkgui/emoticons/tongue.png
rename to data/emoticons/tongue.png
diff --git a/plugins/gtkgui/emoticons/unhappy.png b/data/emoticons/unhappy.png
similarity index 100%
rename from plugins/gtkgui/emoticons/unhappy.png
rename to data/emoticons/unhappy.png
diff --git a/plugins/gtkgui/emoticons/wink.png b/data/emoticons/wink.png
similarity index 100%
rename from plugins/gtkgui/emoticons/wink.png
rename to data/emoticons/wink.png
diff --git a/plugins/gtkgui/emoticons/yes.png b/data/emoticons/yes.png
similarity index 100%
rename from plugins/gtkgui/emoticons/yes.png
rename to data/emoticons/yes.png
diff --git a/plugins/gtkgui/iconsets/gossip/away.png b/data/iconsets/gossip/away.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/away.png
rename to data/iconsets/gossip/away.png
diff --git a/plugins/gtkgui/iconsets/gossip/chat.png b/data/iconsets/gossip/chat.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/chat.png
rename to data/iconsets/gossip/chat.png
diff --git a/plugins/gtkgui/iconsets/gossip/closed.xpm b/data/iconsets/gossip/closed.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/closed.xpm
rename to data/iconsets/gossip/closed.xpm
diff --git a/plugins/gtkgui/iconsets/gossip/connecting.gif b/data/iconsets/gossip/connecting.gif
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/connecting.gif
rename to data/iconsets/gossip/connecting.gif
diff --git a/plugins/gtkgui/iconsets/gossip/connecting.png b/data/iconsets/gossip/connecting.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/connecting.png
rename to data/iconsets/gossip/connecting.png
diff --git a/plugins/gtkgui/iconsets/gossip/dnd.png b/data/iconsets/gossip/dnd.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/dnd.png
rename to data/iconsets/gossip/dnd.png
diff --git a/plugins/gtkgui/iconsets/gossip/error.png b/data/iconsets/gossip/error.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/error.png
rename to data/iconsets/gossip/error.png
diff --git a/plugins/gtkgui/iconsets/gossip/invisible.png b/data/iconsets/gossip/invisible.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/invisible.png
rename to data/iconsets/gossip/invisible.png
diff --git a/plugins/gtkgui/iconsets/gossip/message.png b/data/iconsets/gossip/message.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/message.png
rename to data/iconsets/gossip/message.png
diff --git a/plugins/gtkgui/iconsets/gossip/not_in_the_roster.png b/data/iconsets/gossip/not_in_the_roster.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/not_in_the_roster.png
rename to data/iconsets/gossip/not_in_the_roster.png
diff --git a/plugins/gtkgui/iconsets/gossip/offline.png b/data/iconsets/gossip/offline.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/offline.png
rename to data/iconsets/gossip/offline.png
diff --git a/plugins/gtkgui/iconsets/gossip/online.png b/data/iconsets/gossip/online.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/online.png
rename to data/iconsets/gossip/online.png
diff --git a/plugins/gtkgui/iconsets/gossip/opened.xpm b/data/iconsets/gossip/opened.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/opened.xpm
rename to data/iconsets/gossip/opened.xpm
diff --git a/plugins/gtkgui/iconsets/gossip/requested.png b/data/iconsets/gossip/requested.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/requested.png
rename to data/iconsets/gossip/requested.png
diff --git a/plugins/gtkgui/iconsets/gossip/typing.png b/data/iconsets/gossip/typing.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/typing.png
rename to data/iconsets/gossip/typing.png
diff --git a/plugins/gtkgui/iconsets/gossip/xa.png b/data/iconsets/gossip/xa.png
similarity index 100%
rename from plugins/gtkgui/iconsets/gossip/xa.png
rename to data/iconsets/gossip/xa.png
diff --git a/plugins/gtkgui/iconsets/icq/away.png b/data/iconsets/icq/away.png
similarity index 100%
rename from plugins/gtkgui/iconsets/icq/away.png
rename to data/iconsets/icq/away.png
diff --git a/plugins/gtkgui/iconsets/icq/chat.png b/data/iconsets/icq/chat.png
similarity index 100%
rename from plugins/gtkgui/iconsets/icq/chat.png
rename to data/iconsets/icq/chat.png
diff --git a/plugins/gtkgui/iconsets/icq/closed.xpm b/data/iconsets/icq/closed.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/icq/closed.xpm
rename to data/iconsets/icq/closed.xpm
diff --git a/plugins/gtkgui/iconsets/icq/connecting.png b/data/iconsets/icq/connecting.png
similarity index 100%
rename from plugins/gtkgui/iconsets/icq/connecting.png
rename to data/iconsets/icq/connecting.png
diff --git a/plugins/gtkgui/iconsets/icq/dnd.png b/data/iconsets/icq/dnd.png
similarity index 100%
rename from plugins/gtkgui/iconsets/icq/dnd.png
rename to data/iconsets/icq/dnd.png
diff --git a/plugins/gtkgui/iconsets/icq/invisible.png b/data/iconsets/icq/invisible.png
similarity index 100%
rename from plugins/gtkgui/iconsets/icq/invisible.png
rename to data/iconsets/icq/invisible.png
diff --git a/plugins/gtkgui/iconsets/icq/offline.png b/data/iconsets/icq/offline.png
similarity index 100%
rename from plugins/gtkgui/iconsets/icq/offline.png
rename to data/iconsets/icq/offline.png
diff --git a/plugins/gtkgui/iconsets/icq/online.png b/data/iconsets/icq/online.png
similarity index 100%
rename from plugins/gtkgui/iconsets/icq/online.png
rename to data/iconsets/icq/online.png
diff --git a/plugins/gtkgui/iconsets/icq/opened.xpm b/data/iconsets/icq/opened.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/icq/opened.xpm
rename to data/iconsets/icq/opened.xpm
diff --git a/plugins/gtkgui/iconsets/icq/xa.png b/data/iconsets/icq/xa.png
similarity index 100%
rename from plugins/gtkgui/iconsets/icq/xa.png
rename to data/iconsets/icq/xa.png
diff --git a/plugins/gtkgui/iconsets/msn/away.png b/data/iconsets/msn/away.png
similarity index 100%
rename from plugins/gtkgui/iconsets/msn/away.png
rename to data/iconsets/msn/away.png
diff --git a/plugins/gtkgui/iconsets/msn/closed.xpm b/data/iconsets/msn/closed.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/msn/closed.xpm
rename to data/iconsets/msn/closed.xpm
diff --git a/plugins/gtkgui/iconsets/msn/connecting.png b/data/iconsets/msn/connecting.png
similarity index 100%
rename from plugins/gtkgui/iconsets/msn/connecting.png
rename to data/iconsets/msn/connecting.png
diff --git a/plugins/gtkgui/iconsets/msn/dnd.png b/data/iconsets/msn/dnd.png
similarity index 100%
rename from plugins/gtkgui/iconsets/msn/dnd.png
rename to data/iconsets/msn/dnd.png
diff --git a/plugins/gtkgui/iconsets/msn/offline.png b/data/iconsets/msn/offline.png
similarity index 100%
rename from plugins/gtkgui/iconsets/msn/offline.png
rename to data/iconsets/msn/offline.png
diff --git a/plugins/gtkgui/iconsets/msn/online.png b/data/iconsets/msn/online.png
similarity index 100%
rename from plugins/gtkgui/iconsets/msn/online.png
rename to data/iconsets/msn/online.png
diff --git a/plugins/gtkgui/iconsets/msn/opened.xpm b/data/iconsets/msn/opened.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/msn/opened.xpm
rename to data/iconsets/msn/opened.xpm
diff --git a/plugins/gtkgui/iconsets/stellar/away.png b/data/iconsets/stellar/away.png
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/away.png
rename to data/iconsets/stellar/away.png
diff --git a/plugins/gtkgui/iconsets/stellar/chat.png b/data/iconsets/stellar/chat.png
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/chat.png
rename to data/iconsets/stellar/chat.png
diff --git a/plugins/gtkgui/iconsets/stellar/closed.xpm b/data/iconsets/stellar/closed.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/closed.xpm
rename to data/iconsets/stellar/closed.xpm
diff --git a/plugins/gtkgui/iconsets/stellar/connecting.gif b/data/iconsets/stellar/connecting.gif
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/connecting.gif
rename to data/iconsets/stellar/connecting.gif
diff --git a/plugins/gtkgui/iconsets/stellar/dnd.png b/data/iconsets/stellar/dnd.png
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/dnd.png
rename to data/iconsets/stellar/dnd.png
diff --git a/plugins/gtkgui/iconsets/stellar/error.png b/data/iconsets/stellar/error.png
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/error.png
rename to data/iconsets/stellar/error.png
diff --git a/plugins/gtkgui/iconsets/stellar/invisible.png b/data/iconsets/stellar/invisible.png
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/invisible.png
rename to data/iconsets/stellar/invisible.png
diff --git a/plugins/gtkgui/iconsets/stellar/message.gif b/data/iconsets/stellar/message.gif
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/message.gif
rename to data/iconsets/stellar/message.gif
diff --git a/plugins/gtkgui/iconsets/stellar/not_in_the_roster.png b/data/iconsets/stellar/not_in_the_roster.png
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/not_in_the_roster.png
rename to data/iconsets/stellar/not_in_the_roster.png
diff --git a/plugins/gtkgui/iconsets/stellar/offline.png b/data/iconsets/stellar/offline.png
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/offline.png
rename to data/iconsets/stellar/offline.png
diff --git a/plugins/gtkgui/iconsets/stellar/online.png b/data/iconsets/stellar/online.png
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/online.png
rename to data/iconsets/stellar/online.png
diff --git a/plugins/gtkgui/iconsets/stellar/opened.xpm b/data/iconsets/stellar/opened.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/opened.xpm
rename to data/iconsets/stellar/opened.xpm
diff --git a/plugins/gtkgui/iconsets/stellar/requested.png b/data/iconsets/stellar/requested.png
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/requested.png
rename to data/iconsets/stellar/requested.png
diff --git a/plugins/gtkgui/iconsets/stellar/xa.png b/data/iconsets/stellar/xa.png
similarity index 100%
rename from plugins/gtkgui/iconsets/stellar/xa.png
rename to data/iconsets/stellar/xa.png
diff --git a/plugins/gtkgui/iconsets/sun/away.xpm b/data/iconsets/sun/away.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/away.xpm
rename to data/iconsets/sun/away.xpm
diff --git a/plugins/gtkgui/iconsets/sun/chat.xpm b/data/iconsets/sun/chat.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/chat.xpm
rename to data/iconsets/sun/chat.xpm
diff --git a/plugins/gtkgui/iconsets/sun/closed.xpm b/data/iconsets/sun/closed.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/closed.xpm
rename to data/iconsets/sun/closed.xpm
diff --git a/plugins/gtkgui/iconsets/sun/connecting.gif b/data/iconsets/sun/connecting.gif
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/connecting.gif
rename to data/iconsets/sun/connecting.gif
diff --git a/plugins/gtkgui/iconsets/sun/dnd.xpm b/data/iconsets/sun/dnd.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/dnd.xpm
rename to data/iconsets/sun/dnd.xpm
diff --git a/plugins/gtkgui/iconsets/sun/error.xpm b/data/iconsets/sun/error.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/error.xpm
rename to data/iconsets/sun/error.xpm
diff --git a/plugins/gtkgui/iconsets/sun/invisible.xpm b/data/iconsets/sun/invisible.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/invisible.xpm
rename to data/iconsets/sun/invisible.xpm
diff --git a/plugins/gtkgui/iconsets/sun/message.gif b/data/iconsets/sun/message.gif
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/message.gif
rename to data/iconsets/sun/message.gif
diff --git a/plugins/gtkgui/iconsets/sun/not_in_the_roster.xpm b/data/iconsets/sun/not_in_the_roster.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/not_in_the_roster.xpm
rename to data/iconsets/sun/not_in_the_roster.xpm
diff --git a/plugins/gtkgui/iconsets/sun/offline.xpm b/data/iconsets/sun/offline.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/offline.xpm
rename to data/iconsets/sun/offline.xpm
diff --git a/plugins/gtkgui/iconsets/sun/online.xpm b/data/iconsets/sun/online.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/online.xpm
rename to data/iconsets/sun/online.xpm
diff --git a/plugins/gtkgui/iconsets/sun/opened.xpm b/data/iconsets/sun/opened.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/opened.xpm
rename to data/iconsets/sun/opened.xpm
diff --git a/plugins/gtkgui/iconsets/sun/requested.xpm b/data/iconsets/sun/requested.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/requested.xpm
rename to data/iconsets/sun/requested.xpm
diff --git a/plugins/gtkgui/iconsets/sun/xa.xpm b/data/iconsets/sun/xa.xpm
similarity index 100%
rename from plugins/gtkgui/iconsets/sun/xa.xpm
rename to data/iconsets/sun/xa.xpm
diff --git a/plugins/gtkgui/pixmaps/logo.png b/data/pixmaps/logo.png
similarity index 100%
rename from plugins/gtkgui/pixmaps/logo.png
rename to data/pixmaps/logo.png
diff --git a/plugins/gtkgui/pixmaps/transport/away.png b/data/pixmaps/transport/away.png
similarity index 100%
rename from plugins/gtkgui/pixmaps/transport/away.png
rename to data/pixmaps/transport/away.png
diff --git a/plugins/gtkgui/pixmaps/transport/dnd.png b/data/pixmaps/transport/dnd.png
similarity index 100%
rename from plugins/gtkgui/pixmaps/transport/dnd.png
rename to data/pixmaps/transport/dnd.png
diff --git a/plugins/gtkgui/pixmaps/transport/icondef.xml b/data/pixmaps/transport/icondef.xml
similarity index 100%
rename from plugins/gtkgui/pixmaps/transport/icondef.xml
rename to data/pixmaps/transport/icondef.xml
diff --git a/plugins/gtkgui/pixmaps/transport/offline.png b/data/pixmaps/transport/offline.png
similarity index 100%
rename from plugins/gtkgui/pixmaps/transport/offline.png
rename to data/pixmaps/transport/offline.png
diff --git a/plugins/gtkgui/pixmaps/transport/online.png b/data/pixmaps/transport/online.png
similarity index 100%
rename from plugins/gtkgui/pixmaps/transport/online.png
rename to data/pixmaps/transport/online.png
diff --git a/plugins/gtkgui/pixmaps/transport/xa.png b/data/pixmaps/transport/xa.png
similarity index 100%
rename from plugins/gtkgui/pixmaps/transport/xa.png
rename to data/pixmaps/transport/xa.png
diff --git a/sounds/connected.wav b/data/sounds/connected.wav
similarity index 100%
rename from sounds/connected.wav
rename to data/sounds/connected.wav
diff --git a/sounds/disconnected.wav b/data/sounds/disconnected.wav
similarity index 100%
rename from sounds/disconnected.wav
rename to data/sounds/disconnected.wav
diff --git a/sounds/message1.wav b/data/sounds/message1.wav
similarity index 100%
rename from sounds/message1.wav
rename to data/sounds/message1.wav
diff --git a/sounds/message2.wav b/data/sounds/message2.wav
similarity index 100%
rename from sounds/message2.wav
rename to data/sounds/message2.wav
diff --git a/sounds/sent.wav b/data/sounds/sent.wav
similarity index 100%
rename from sounds/sent.wav
rename to data/sounds/sent.wav
diff --git a/plugins/__init__.py b/plugins/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/plugins/gtkgui/__init__.py b/plugins/gtkgui/__init__.py
deleted file mode 100644
index d49fd1b836434284bce0563fddc063b8903b26e2..0000000000000000000000000000000000000000
--- a/plugins/gtkgui/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import gtkgui
-
diff --git a/plugins/logger/__init__.py b/plugins/logger/__init__.py
deleted file mode 100644
index f09f064b50345e2c8dad67bb1882460bfb1d5421..0000000000000000000000000000000000000000
--- a/plugins/logger/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import logger
diff --git a/plugins/sock/__init__.py b/plugins/sock/__init__.py
deleted file mode 100644
index 577c9133ac90715deac81345238678f505a0b9e8..0000000000000000000000000000000000000000
--- a/plugins/sock/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import sock
diff --git a/plugins/sock/sock.py b/plugins/sock/sock.py
deleted file mode 100644
index d3f5bb4801878ecf0f16ae6e1f0b070d12260874..0000000000000000000000000000000000000000
--- a/plugins/sock/sock.py
+++ /dev/null
@@ -1,171 +0,0 @@
-## plugins/sock.py
-##
-## Gajim Team:
-## - Yann Le Boulanger <asterix@lagaule.org>
-## - Vincent Hanquez <tab@snarc.org>
-##
-## Copyright (C) 2003-2005 Gajim Team
-##
-## 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 only.
-##
-## 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.
-##
-
-import socket, select
-import pickle
-import Queue
-import sys
-
-from common import i18n
-_ = i18n._
-
-
-def XMLescape(txt):
- "Escape XML entities"
- txt = txt.replace("&", "&")
- txt = txt.replace("<", "<")
- txt = txt.replace(">", ">")
- return txt
-
-def XMLunescape(txt):
- "Unescape XML entities"
- txt = txt.replace(">", ">")
- txt = txt.replace("<", "<")
- txt = txt.replace("&", "&")
- return txt
-
-class plugin:
-
- def wait(self, what):
- """Wait for a message from Core"""
- #TODO: timeout
- temp_q = Queue.Queue(50)
- while 1:
- if not self.queueIN.empty():
- ev = self.queueIN.get()
- if ev[0] == what and ev[2][0] == 'sock':
- #Restore messages
- while not temp_q.empty():
- ev2 = temp_q.get()
- self.queueIN.put(ev2)
- return ev[2][1]
- else:
- #Save messages
- temp_q.put(ev)
-
- def send(self, event, account, data):
- self.queueOUT.put((event, account, data))
-
- def handle_queue_quit(self, account, array):
-# for sock in self.active_socket:
-# if sock != self.active_socket:
-# sock.close()
- self.quit_recieved = 1
-
- def handle_socket_reg_message(self, sock, array):
- for type in array:
- if self.message_types.has_key(type):
- if not sock in self.message_types[type]:
- self.message_types[type].append(sock)
- else:
- self.message_types[type] = [sock]
-
- def send_to_socket(self, ev, sock):
- evp = pickle.dumps(ev)
- sock.send('<'+XMLescape(evp)+'>')
-
- def unparse_socket(self, data):
- list_ev = []
- while data:
- deb = data.find('<')
- end = data.find('>', deb)
- list_ev.append(pickle.loads(data[deb+1:end]))
- data = data[end+1:]
- return list_ev
-
- def read_queue(self):
- while self.queueIN.empty() == 0:
- ev = self.queueIN.get()
- if ev[0] in self.message_types:
- for sock in self.message_types[ev[0]]:
- self.send_to_socket(ev, sock)
- if ev[0] == 'QUIT':
- self.handle_queue_quit(ev[1], ev[2])
-# return 1
- return 0
-
- def read_socket(self):
- ready_to_read, ready_to_write, in_error = select.select(
- self.active_socket, [], [], 0.1)
-
- for sock in ready_to_read:
- if sock == self.socket:
- conn, addr = self.socket.accept()
- # Connected by addr
- print _("Connection from "), addr
- self.active_socket.append(conn)
- else:
- try:
- data = sock.recv(1024)
- except:
- self.active_socket.remove(sock)
- break
- if not data:
- # disconnected
- print _("disconnected")
- self.active_socket.remove(sock)
- break
- while len(data) == 1024:
- data += sock.recv(1024)
- list_ev = self.unparse_socket(data)
- for ev in list_ev:
- if ev[0] == 'REG_MESSAGE':
- self.handle_socket_reg_message(sock, ev[2])
- ev = (ev[0], 'sock', ev[2])
- self.queueOUT.put(ev)
- return 0
-
- def __init__(self, quIN, quOUT):
- self.queueIN = quIN
- self.queueOUT = quOUT
- self.send('REG_MESSAGE', 'sock', ['QUIT', 'CONFIG'])
- quOUT.put(('ASK_CONFIG', None, ('sock', 'sock', {\
- 'port':8255})))
- self.config = self.wait('CONFIG')
- self.message_types = {}
- #create socket
- self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- HOST = socket.gethostbyname(socket.gethostname())
- if self.config.has_key('host'):
- HOST = socket.gethostbyname(self.config['host'])
- try:
- self.socket.bind((HOST, self.config['port']))
- except:
- print _('plugin sock cannot be launched : ') + \
- str(sys.exc_info()[1][0:])
- return
- self.socket.listen(5)
-
- self.active_socket = [self.socket]
- end = 0
- self.quit_recieved = 0
-
- while not end:
- # listen to the socket
- end = self.read_socket()
- # listen to the input Queue
- end = self.read_queue()
- if self.quit_recieved:
- if len(self.active_socket) == 1:
- end = 1
- print _("plugin sock stopped")
-
-if __name__ == "__main__":
- plugin(None, None)
-
-print _("plugin sock loaded")
diff --git a/plugins/gtkgui/Makefile b/src/Makefile
similarity index 100%
rename from plugins/gtkgui/Makefile
rename to src/Makefile
diff --git a/plugins/gtkgui/chat.py b/src/chat.py
similarity index 100%
rename from plugins/gtkgui/chat.py
rename to src/chat.py
diff --git a/Core/GnuPG.py b/src/common/GnuPG.py
similarity index 100%
rename from Core/GnuPG.py
rename to src/common/GnuPG.py
diff --git a/common/Makefile b/src/common/Makefile
similarity index 100%
rename from common/Makefile
rename to src/common/Makefile
diff --git a/Core/connection.py b/src/common/connection.py
similarity index 100%
rename from Core/connection.py
rename to src/common/connection.py
diff --git a/common/debug.py b/src/common/debug.py
similarity index 100%
rename from common/debug.py
rename to src/common/debug.py
diff --git a/common/i18n.py b/src/common/i18n.py
similarity index 100%
rename from common/i18n.py
rename to src/common/i18n.py
diff --git a/common/idle.c b/src/common/idle.c
similarity index 100%
rename from common/idle.c
rename to src/common/idle.c
diff --git a/common/jabber.py b/src/common/jabber.py
similarity index 100%
rename from common/jabber.py
rename to src/common/jabber.py
diff --git a/plugins/logger/logger.py b/src/common/logger.py
similarity index 100%
rename from plugins/logger/logger.py
rename to src/common/logger.py
diff --git a/common/optparser.py b/src/common/optparser.py
similarity index 100%
rename from common/optparser.py
rename to src/common/optparser.py
diff --git a/common/setup.py b/src/common/setup.py
similarity index 100%
rename from common/setup.py
rename to src/common/setup.py
diff --git a/common/sleepy.py b/src/common/sleepy.py
similarity index 100%
rename from common/sleepy.py
rename to src/common/sleepy.py
diff --git a/common/xmlstream.py b/src/common/xmlstream.py
similarity index 100%
rename from common/xmlstream.py
rename to src/common/xmlstream.py
diff --git a/plugins/gtkgui/config.py b/src/config.py
similarity index 100%
rename from plugins/gtkgui/config.py
rename to src/config.py
diff --git a/plugins/gtkgui/dialogs.py b/src/dialogs.py
similarity index 100%
rename from plugins/gtkgui/dialogs.py
rename to src/dialogs.py
diff --git a/plugins/gtkgui/eggtrayicon.c b/src/eggtrayicon.c
similarity index 100%
rename from plugins/gtkgui/eggtrayicon.c
rename to src/eggtrayicon.c
diff --git a/plugins/gtkgui/eggtrayicon.h b/src/eggtrayicon.h
similarity index 100%
rename from plugins/gtkgui/eggtrayicon.h
rename to src/eggtrayicon.h
diff --git a/plugins/gtkgui/groupchat_window.py b/src/groupchat_window.py
similarity index 100%
rename from plugins/gtkgui/groupchat_window.py
rename to src/groupchat_window.py
diff --git a/plugins/gtkgui/gtkgui.glade b/src/gtkgui.glade
similarity index 100%
rename from plugins/gtkgui/gtkgui.glade
rename to src/gtkgui.glade
diff --git a/plugins/gtkgui/gtkgui.py b/src/gtkgui.py
similarity index 100%
rename from plugins/gtkgui/gtkgui.py
rename to src/gtkgui.py
diff --git a/plugins/gtkgui/history_window.py b/src/history_window.py
similarity index 100%
rename from plugins/gtkgui/history_window.py
rename to src/history_window.py
diff --git a/plugins/gtkgui/roster_window.py b/src/roster_window.py
similarity index 100%
rename from plugins/gtkgui/roster_window.py
rename to src/roster_window.py
diff --git a/plugins/gtkgui/systray.py b/src/systray.py
similarity index 100%
rename from plugins/gtkgui/systray.py
rename to src/systray.py
diff --git a/plugins/gtkgui/tabbed_chat_window.py b/src/tabbed_chat_window.py
similarity index 100%
rename from plugins/gtkgui/tabbed_chat_window.py
rename to src/tabbed_chat_window.py
diff --git a/plugins/gtkgui/trayicon.defs b/src/trayicon.defs
similarity index 100%
rename from plugins/gtkgui/trayicon.defs
rename to src/trayicon.defs
diff --git a/plugins/gtkgui/trayicon.override b/src/trayicon.override
similarity index 100%
rename from plugins/gtkgui/trayicon.override
rename to src/trayicon.override
diff --git a/plugins/gtkgui/trayiconmodule.c b/src/trayiconmodule.c
similarity index 100%
rename from plugins/gtkgui/trayiconmodule.c
rename to src/trayiconmodule.c