aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qtopia/qpe-gaim
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-24 17:57:24 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-30 02:35:12 +0100
commite9b45ff67d32fdc27950a51135b6dabada8334e7 (patch)
treede99cd760c8292ee1dd334e23e1e5cc43e90dfbd /recipes-qtopia/qpe-gaim
downloadmeta-opie-e9b45ff67d32fdc27950a51135b6dabada8334e7.tar.gz
meta-opie-e9b45ff67d32fdc27950a51135b6dabada8334e7.tar.bz2
meta-opie-e9b45ff67d32fdc27950a51135b6dabada8334e7.zip
initial commit of meta-opie
Populate the repository with files from OpenEmbedded at revision 45edf621296daf150c72b876d720861235e5762e - no changes, only rearranged the directory structure to match the new oe-core style and added COPYING.MIT and README. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'recipes-qtopia/qpe-gaim')
-rw-r--r--recipes-qtopia/qpe-gaim/files/buzzer-notification.patch48
-rw-r--r--recipes-qtopia/qpe-gaim/files/dont-look-for-gtk.patch18
-rw-r--r--recipes-qtopia/qpe-gaim/files/libgaim.patch408
-rw-r--r--recipes-qtopia/qpe-gaim/files/qpe-gaim.patch721
-rw-r--r--recipes-qtopia/qpe-gaim/files/vit.patch327
-rw-r--r--recipes-qtopia/qpe-gaim/qpe-gaim_20041030.bb40
-rw-r--r--recipes-qtopia/qpe-gaim/qpe-libgaim_1.5.0.bb57
7 files changed, 1619 insertions, 0 deletions
diff --git a/recipes-qtopia/qpe-gaim/files/buzzer-notification.patch b/recipes-qtopia/qpe-gaim/files/buzzer-notification.patch
new file mode 100644
index 0000000..2aefe1d
--- /dev/null
+++ b/recipes-qtopia/qpe-gaim/files/buzzer-notification.patch
@@ -0,0 +1,48 @@
+#
+# with this patch qpe-gaim also notifies if it is minimized to the taskbar.
+# this could be nice if you have more apps open
+#
+# Author: Patrick Steiner <patrick.steiner@a1.ner>
+# Version: 1.01 (20050328)
+#
+
+Index: qpe-gaim/src/QGaimConvWindow.cpp
+===================================================================
+--- qpe-gaim.orig/src/QGaimConvWindow.cpp 2005-04-03 19:57:31.924379043 +0200
++++ qpe-gaim/src/QGaimConvWindow.cpp 2005-04-03 20:02:03.281769318 +0200
+@@ -175,24 +175,20 @@
+ win = gaim_conversation_get_window(conv);
+ activeConv = gaim_conv_window_get_active_conversation(win);
+
+- if (conv != activeConv ||
+- win != qGaimGetMainWindow()->getLastActiveConvWindow())
+- {
+- const char *prefName;
++ const char *prefName;
+
+- if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+- prefName = "/gaim/qpe/notify/incoming_chat";
+- else
+- prefName = "/gaim/qpe/notify/incoming_im";
++ if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
++ prefName = "/gaim/qpe/notify/incoming_chat";
++ else
++ prefName = "/gaim/qpe/notify/incoming_im";
+
+- if (gaim_prefs_get_bool(prefName))
+- {
+- if (notifying)
+- qGaimNotifyUserStop();
++ if (gaim_prefs_get_bool(prefName))
++ {
++ if (notifying)
++ qGaimNotifyUserStop();
+
+- qGaimNotifyUser();
+- notifying = true;
+- }
++ qGaimNotifyUser();
++ notifying = true;
+ }
+ }
+ }
diff --git a/recipes-qtopia/qpe-gaim/files/dont-look-for-gtk.patch b/recipes-qtopia/qpe-gaim/files/dont-look-for-gtk.patch
new file mode 100644
index 0000000..889a6ae
--- /dev/null
+++ b/recipes-qtopia/qpe-gaim/files/dont-look-for-gtk.patch
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libgaim/configure.ac~dont-look-for-gtk
++++ libgaim/configure.ac
+@@ -253,10 +253,6 @@
+ *** GLib 2.0 is required to build Gaim; please make sure you have the GLib
+ *** development headers installed. The latest version of GLib is
+ *** always available at http://www.gtk.org/.]))
+-AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR([
+-*** GTK+ 2.0 is required to build Gaim; please make sure you have the GTK+
+-*** development headers installed. The latest version of GTK+ is
+-*** always available at http://www.gtk.org/.]))
+
+ AC_PATH_PROG(gaimpath, gaim)
+ AC_SUBST(GTK_CFLAGS)
diff --git a/recipes-qtopia/qpe-gaim/files/libgaim.patch b/recipes-qtopia/qpe-gaim/files/libgaim.patch
new file mode 100644
index 0000000..f7042c3
--- /dev/null
+++ b/recipes-qtopia/qpe-gaim/files/libgaim.patch
@@ -0,0 +1,408 @@
+Index: gaim-1.3.0/src/status.c
+===================================================================
+--- gaim-1.3.0.orig/src/status.c 2005-02-10 01:07:25.000000000 +0100
++++ gaim-1.3.0/src/status.c 2005-06-05 02:21:59.000000000 +0200
+@@ -24,10 +24,13 @@
+ #include "internal.h"
+ #include "debug.h"
+ #include "util.h"
++#include "away.h"
+
+ /* XXX CORE/UI */
++#if 0
+ #include "away.h"
+ #include "gtkgaim.h"
++#endif
+
+
+ /* for people like myself who are too lazy to add an away msg :) */
+Index: gaim-1.3.0/plugins/Makefile.am
+===================================================================
+--- gaim-1.3.0.orig/plugins/Makefile.am 2005-04-29 19:01:57.000000000 +0200
++++ gaim-1.3.0/plugins/Makefile.am 2005-06-05 02:24:20.000000000 +0200
+@@ -13,46 +13,29 @@
+ endif
+
+ SUBDIRS = \
+- docklet gaim-remote $(GEVOLUTION_DIR) gestures \
+- $(PERL_DIR) $(TCL_DIR) ssl ticker
++ $(GEVOLUTION_DIR) \
++ $(PERL_DIR) $(TCL_DIR) ssl
+
+ plugindir = $(libdir)/gaim
+
+ autorecon_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+ extplacement_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+-history_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+-iconaway_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+ idle_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+-notify_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+ relnot_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+-spellchk_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+ statenotify_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+-timestamp_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
+
+ if PLUGINS
+
+ plugin_LTLIBRARIES = \
+ autorecon.la \
+- extplacement.la \
+- history.la \
+- iconaway.la \
+ idle.la \
+- notify.la \
+ relnot.la \
+- spellchk.la \
+- statenotify.la \
+- timestamp.la
++ statenotify.la
+
+ autorecon_la_SOURCES = autorecon.c
+-extplacement_la_SOURCES = extplacement.c
+-history_la_SOURCES = history.c
+-iconaway_la_SOURCES = iconaway.c
+ idle_la_SOURCES = idle.c
+-notify_la_SOURCES = notify.c
+ relnot_la_SOURCES = relnot.c
+-spellchk_la_SOURCES = spellchk.c
+ statenotify_la_SOURCES = statenotify.c
+-timestamp_la_SOURCES = timestamp.c
+
+ endif # PLUGINS
+
+@@ -74,7 +57,7 @@
+ -DVERSION=\"$(VERSION)\" \
+ -I$(top_srcdir)/src \
+ $(DEBUG_CFLAGS) \
+- $(GTK_CFLAGS) \
++ $(GLIB_CFLAGS) \
+ $(PLUGIN_CFLAGS)
+
+ #
+Index: gaim-1.3.0/src/gaim.h
+===================================================================
+--- gaim-1.3.0.orig/src/gaim.h 2004-08-08 07:37:58.000000000 +0200
++++ gaim-1.3.0/src/gaim.h 2005-06-05 02:21:59.000000000 +0200
+@@ -27,6 +27,10 @@
+
+ #include "connection.h"
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* Globals in main.c */
+ extern int opt_away;
+ extern char *opt_away_arg;
+@@ -36,7 +40,28 @@
+ extern GSList *unread_message_queue;
+ extern GSList *away_time_queue;
+
++
++/* copied from gtkdialog.h */
++struct queued_message {
++ char name[80];
++ char alias[80];
++ char *message;
++ time_t tm;
++ GaimAccount *account;
++ GaimMessageFlags flags;
++};
++
+ /* Functions in idle.c */
+ extern gint check_idle(gpointer);
+
++/* Variable in .. */
++extern int docklet_count;
++
++/* implemented by gtkutils.h and used by server.c */
++extern char *stylize(const gchar *text, int length);
++
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _GAIM_H_ */
+Index: gaim-1.3.0/src/Makefile.am
+===================================================================
+--- gaim-1.3.0.orig/src/Makefile.am 2005-04-11 22:59:21.000000000 +0200
++++ gaim-1.3.0/src/Makefile.am 2005-06-05 02:21:59.000000000 +0200
+@@ -61,6 +61,8 @@
+
+ SUBDIRS = protocols
+
++lib_LTLIBRARIES = libgaim.la
++
+ gaim_coresources = \
+ account.c \
+ accountopt.c \
+@@ -112,6 +114,7 @@
+ debug.h \
+ eventloop.h \
+ ft.h \
++ gaim.h \
+ imgstore.h \
+ log.h \
+ md5.h \
+@@ -139,101 +142,21 @@
+ version.h \
+ xmlnode.h
+
+-bin_PROGRAMS = gaim gaim-remote
+-
+-gaim_SOURCES = \
+- $(gaim_coresources) \
+- away.c \
+- dnd-hints.c \
+- gaim-disclosure.c \
+- gtkaccount.c \
+- gtkcellrendererprogress.c \
+- gtkblist.c \
+- gtkconn.c \
+- gtkconv.c \
+- gtkdebug.c \
+- gtkdialogs.c \
+- gtkeventloop.c \
+- gtkft.c \
+- gtkimhtml.c \
+- gtkimhtmltoolbar.c \
+- gtklog.c \
+- gtknotify.c \
+- gtkplugin.c \
+- gtkpluginpref.c \
+- gtkprefs.c \
+- gtkprivacy.c \
+- gtkpounce.c \
+- gtkrequest.c \
+- gtkroomlist.c \
+- gtksound.c \
+- gtksourceiter.c \
+- gtkutils.c \
+- idle.c \
+- main.c \
+- session.c \
+- stock.c \
+- themes.c
+-
+-gaim_headers = \
+- $(gaim_coreheaders) \
+- dnd-hints.h \
+- gaim.h \
+- gaim-disclosure.h \
+- gtkaccount.h \
+- gtkcellrendererprogress.h \
+- gtkblist.h \
+- gtkconn.h \
+- gtkconv.h \
+- gtkdebug.h \
+- gtkdialogs.h \
+- gtkeventloop.h \
+- gtkft.h \
+- gtkgaim.h \
+- gtkimhtml.h \
+- gtkimhtmltoolbar.h \
+- gtklog.h \
+- gtknotify.h \
+- gtkplugin.h \
+- gtkpluginpref.h \
+- gtkprefs.h \
+- gtkprivacy.h \
+- gtkpounce.h \
+- gtkrequest.h \
+- gtkroomlist.h \
+- gtksound.h \
+- gtksourceiter.h \
+- gtkutils.h \
+- internal.h \
+- stock.h
+
+ gaimincludedir=$(includedir)/gaim
+ gaiminclude_HEADERS = \
+- $(gaim_coreheaders) \
+- $(gaim_headers)
++ $(gaim_coreheaders)
+
+-gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
+-gaim_LDFLAGS = -export-dynamic
+-gaim_LDADD = \
+- @LIBOBJS@ \
+- $(GTK_LIBS) \
+- $(SOUND_LIBS) \
+- $(STATIC_LINK_LIBS) \
+- $(XSS_LIBS) \
+- $(SM_LIBS) \
+- $(INTLLIBS) \
+- $(GTKSPELL_LIBS) \
+- $(STARTUP_NOTIFICATION_LIBS)
+-
+-gaim_remote_SOURCES = \
+- gaim-remote.c \
+- prefix.c \
+- prefix.h
++libgaim_la_SOURCES = \
++ $(gaim_coresources)
+
+-gaim_remote_DEPENDENCIES = @LIBOBJS@
+-gaim_remote_LDADD = \
+- @LIBOBJS@ $(GLIB_LIBS) $(INTLLIBS) \
+- $(top_builddir)/plugins/gaim-remote/libgaim-remote.la
++libgaim_la_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
++libgaim_la_LDFLAGS = -version-info 0:0:0
++libgaim_la_LIBDADD = \
++ @LIBOBJS@
++ $(GLIB_LIBS) \
++ $(STATIC_LINK_LIBS) \
++ $(INTLLIBS)
+
+ AM_CPPFLAGS = \
+ -DBR_PTHREADS=0 \
+@@ -242,9 +165,5 @@
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -I$(top_srcdir)/plugins \
+- $(AUDIOFILE_CFLAGS) \
+- $(AO_CFLAGS) \
+ $(DEBUG_CFLAGS) \
+- $(GTK_CFLAGS) \
+- $(GTKSPELL_CFLAGS) \
+- $(STARTUP_NOTIFICATION_CFLAGS)
++ $(GLIB_CFLAGS)
+Index: gaim-1.3.0/plugins/extplacement.c
+===================================================================
+--- gaim-1.3.0.orig/plugins/extplacement.c 2004-09-03 23:34:03.000000000 +0200
++++ gaim-1.3.0/plugins/extplacement.c 2005-06-05 02:21:59.000000000 +0200
+@@ -21,10 +21,12 @@
+ */
+
+ #include "internal.h"
++#if 0
+ #include "gtkgaim.h"
++#include "gtkplugin.h"
++#endif
+ #include "conversation.h"
+ #include "version.h"
+-#include "gtkplugin.h"
+
+ static void
+ conv_placement_by_number(GaimConversation *conv)
+Index: gaim-1.3.0/src/away.h
+===================================================================
+--- gaim-1.3.0.orig/src/away.h 2004-08-20 07:11:29.000000000 +0200
++++ gaim-1.3.0/src/away.h 2005-06-05 02:21:59.000000000 +0200
+@@ -25,7 +25,7 @@
+ #ifndef _GAIM_AWAY_H_
+ #define _GAIM_AWAY_H_
+
+-#include "gtkgaim.h"
++#include "gaim.h"
+
+ /* XXX CUI: away messages aren't really anything more than char* but we need two char*'s
+ * for the UI so that people can name their away messages when they save them. So these
+@@ -36,6 +36,23 @@
+ char message[2048];
+ };
+
++
++
++extern GSList *away_messages;
++extern struct away_message *awaymessage;
++extern void *awaymenu;
++extern void *awayqueue;
++extern void *awayqueuestore;
++
++extern void rem_away_mess(void *, struct away_message *);
++extern void do_away_message(void *, struct away_message *);
++extern void do_away_menu();
++extern void toggle_away_queue();
++extern void purge_away_queue(GSList **);
++extern void do_im_back(void *, void*);
++void create_away_mess(void *, void *);
++
++#if 0
+ extern GSList *away_messages;
+ extern struct away_message *awaymessage;
+ extern GtkWidget *awaymenu;
+@@ -49,5 +66,6 @@
+ extern void purge_away_queue(GSList **);
+ extern void do_im_back(GtkWidget *, GtkWidget *);
+ void create_away_mess(GtkWidget *, void *);
++#endif
+
+ #endif /* _GAIM_AWAY_H_ */
+Index: gaim-1.3.0/src/server.c
+===================================================================
+--- gaim-1.3.0.orig/src/server.c 2005-04-14 21:17:50.000000000 +0200
++++ gaim-1.3.0/src/server.c 2005-06-05 02:21:59.000000000 +0200
+@@ -32,13 +32,17 @@
+ #include "server.h"
+ #include "sound.h"
+ #include "util.h"
++#include "gaim.h"
++#include "away.h"
+
++#if 0
+ /* XXX UI Stuff */
+ #include "away.h"
+ #include "gtkdialogs.h"
+ #include "gaim.h"
+ #include "gtkimhtml.h"
+ #include "gtkutils.h"
++#endif
+
+ #define SECS_BEFORE_RESENDING_AUTORESPONSE 600
+ #define SEX_BEFORE_RESENDING_AUTORESPONSE "Only after you're married"
+@@ -805,6 +809,8 @@
+ gchar *temp;
+ gint i = 0;
+ gboolean valid;
++
++#if 0
+ GtkTreeIter iter;
+
+ valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(awayqueuestore), &iter);
+@@ -817,6 +823,7 @@
+ i++;
+ valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(awayqueuestore), &iter);
+ }
++#endif
+
+ return -1;
+ }
+@@ -828,7 +835,7 @@
+
+ templist = message_queue;
+
+- while (templist) {
++ while (templist) {
+ struct queued_message *qm = (struct queued_message *)templist->data;
+ if ((qm->flags & GAIM_MESSAGE_RECV) && !strcmp(name, qm->name))
+ i++;
+@@ -964,6 +971,7 @@
+ qm->flags = msgflags;
+
+ if (queue_to_away) {
++#if 0
+ GtkTreeIter iter;
+ gchar path[10];
+
+@@ -992,6 +1000,7 @@
+ 2, _("(1 message)"),
+ -1);
+ }
++#endif
+ } else /* queue_to_docklet */
+ unread_message_queue = g_slist_append(unread_message_queue, qm);
+ } else {
+@@ -1049,7 +1058,12 @@
+ lar->sent = t;
+
+ /* apply default fonts and colors */
++ #if 0
+ tmpmsg = stylize(gc->away, MSG_LEN);
++ #else
++ tmpmsg = (gchar*)g_malloc(MSG_LEN);
++ g_snprintf(tmpmsg, MSG_LEN, "%s", gc->away);
++ #endif
+
+ /* Move this to oscar.c! */
+ buffy = gaim_str_sub_away_formatters(tmpmsg, alias);
diff --git a/recipes-qtopia/qpe-gaim/files/qpe-gaim.patch b/recipes-qtopia/qpe-gaim/files/qpe-gaim.patch
new file mode 100644
index 0000000..8ab6a6a
--- /dev/null
+++ b/recipes-qtopia/qpe-gaim/files/qpe-gaim.patch
@@ -0,0 +1,721 @@
+Nur in qpe-gaim: gaim.
+diff -ur qpe-gaim.old/gaim.pro qpe-gaim/gaim.pro
+--- qpe-gaim.old/gaim.pro 2004-10-30 20:08:11.000000000 +0200
++++ qpe-gaim/gaim.pro 2005-03-03 23:04:20.000000000 +0100
+@@ -159,19 +159,22 @@
+ mktarball.sh
+
+ INCLUDEPATH += \
+- $(QPEDIR)/include \
++ $(OPIEDIR)/include \
++ /home/ich/programming/oe/gaim/libgaim_install/include \
+ /usr/include/glib-2.0 \
+ /usr/lib/glib-2.0/include
+
+-DEPENDPATH += $(QPEDIR)/include
++DEPENDPATH += $(OPIEDIR)/include
+ LIBS += \
+ -lqpe \
+- -lopie \
+- -ljpeg \
+- -lpng12 \
++ -lopiecore2 \
++ -lopieui2 \
+ -lgaim \
+ -lglib-2.0 \
+ -lgmodule-2.0
+
++LIBRARYPATH += $(OPIEDIR)/lib
++LIBPATH += $(OPIEDIR)/lib
++
+ OBJECTS_DIR = obj
+ MOC_DIR = moc
+diff -ur qpe-gaim.old/src/main.cpp qpe-gaim/src/main.cpp
+--- qpe-gaim.old/src/main.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/main.cpp 2005-02-28 23:57:59.000000000 +0100
+@@ -20,7 +20,37 @@
+ */
+ #include "QGaimMainWindow.h"
+
+-#include <qpe/qpeapplication.h>
+-#include <opie/oapplicationfactory.h>
++
++extern "C" {
++/*
++ * Variables needed to be defined
++ */
++GSList *away_messages = NULL;
++GSList *unread_message_queue = NULL;
++GSList *message_queue = NULL;
++int docklet_count = 0;
++struct away_message *awaymessage = NULL;
++int opt_debug = 0;
++
++void *awayqueue = NULL;
++void *awayquestore = NULL;
++
++gint check_idle(gpointer data)
++{
++ return FALSE;
++}
++
++}
++
++char *stylize(const gchar *text, int length)
++{
++ gchar *buf = (gchar*)g_malloc(length);
++ g_snprintf(buf, length, "%s", text );
++
++ return buf;
++}
++
++#include <opie2/oapplicationfactory.h>
++using namespace Opie::Core;
+
+ OPIE_EXPORT_APP(OApplicationFactory<QGaimMainWindow>)
+Nur in qpe-gaim/src: main.cpp~.
+diff -ur qpe-gaim.old/src/QGaimAccountBox.cpp qpe-gaim/src/QGaimAccountBox.cpp
+--- qpe-gaim.old/src/QGaimAccountBox.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimAccountBox.cpp 2005-02-28 23:21:30.000000000 +0100
+@@ -21,7 +21,7 @@
+ #include "QGaimAccountBox.h"
+ #include "QGaimProtocolUtils.h"
+
+-#include <libgaim/debug.h>
++#include <gaim/debug.h>
+
+ #include <qpixmap.h>
+
+diff -ur qpe-gaim.old/src/QGaimAccountBox.h qpe-gaim/src/QGaimAccountBox.h
+--- qpe-gaim.old/src/QGaimAccountBox.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimAccountBox.h 2005-02-28 23:21:30.000000000 +0100
+@@ -23,7 +23,7 @@
+
+ #include <qcombobox.h>
+
+-#include <libgaim/account.h>
++#include <gaim/account.h>
+
+ class QGaimAccountBox : public QComboBox
+ {
+diff -ur qpe-gaim.old/src/QGaimAccountEditor.cpp qpe-gaim/src/QGaimAccountEditor.cpp
+--- qpe-gaim.old/src/QGaimAccountEditor.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimAccountEditor.cpp 2005-02-28 23:21:30.000000000 +0100
+@@ -25,8 +25,8 @@
+ #include "QGaimTabWidget.h"
+ #include "base.h"
+
+-#include <libgaim/accountopt.h>
+-#include <libgaim/debug.h>
++#include <gaim/accountopt.h>
++#include <gaim/debug.h>
+
+ #include <qcheckbox.h>
+ #include <qcombobox.h>
+diff -ur qpe-gaim.old/src/QGaimAccountEditor.h qpe-gaim/src/QGaimAccountEditor.h
+--- qpe-gaim.old/src/QGaimAccountEditor.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimAccountEditor.h 2005-02-28 23:21:30.000000000 +0100
+@@ -21,9 +21,9 @@
+ #ifndef _QGAIM_ACCOUNT_EDITOR_H_
+ #define _QGAIM_ACCOUNT_EDITOR_H_
+
+-#include <libgaim/account.h>
+-#include <libgaim/plugin.h>
+-#include <libgaim/prpl.h>
++#include <gaim/account.h>
++#include <gaim/plugin.h>
++#include <gaim/prpl.h>
+
+ #include <qdialog.h>
+ #include <qlist.h>
+diff -ur qpe-gaim.old/src/QGaimAccountsWindow.cpp qpe-gaim/src/QGaimAccountsWindow.cpp
+--- qpe-gaim.old/src/QGaimAccountsWindow.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimAccountsWindow.cpp 2005-03-03 23:03:50.000000000 +0100
+@@ -27,8 +27,8 @@
+ #include "QGaimMainWindow.h"
+ #include "base.h"
+
+-#include <libgaim/prpl.h>
+-#include <libgaim/signals.h>
++#include <gaim/prpl.h>
++#include <gaim/signals.h>
+
+ #include <qpe/resource.h>
+ #include <qaction.h>
+@@ -417,6 +417,10 @@
+ void
+ QGaimAccountsWindow::connectToAccount()
+ {
++ if ( !accountsView->selectedItem() )
++ return;
++
++
+ QGaimAccountListItem *item;
+
+ connectButton->setEnabled(false);
+@@ -431,6 +435,9 @@
+ void
+ QGaimAccountsWindow::disconnectFromAccount()
+ {
++ if ( !accountsView->selectedItem() )
++ return;
++
+ QGaimAccountListItem *item;
+
+ item = (QGaimAccountListItem *)accountsView->selectedItem();
+Nur in qpe-gaim/src: QGaimAccountsWindow.cpp~.
+diff -ur qpe-gaim.old/src/QGaimAccountsWindow.h qpe-gaim/src/QGaimAccountsWindow.h
+--- qpe-gaim.old/src/QGaimAccountsWindow.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimAccountsWindow.h 2005-02-28 23:21:30.000000000 +0100
+@@ -21,7 +21,7 @@
+ #ifndef _QGAIM_ACCOUNTS_WINDOW_H_
+ #define _QGAIM_ACCOUNTS_WINDOW_H_
+
+-#include <libgaim/prpl.h>
++#include <gaim/prpl.h>
+
+ #include <qvariant.h>
+ #include <qwidget.h>
+diff -ur qpe-gaim.old/src/QGaimBListWindow.cpp qpe-gaim/src/QGaimBListWindow.cpp
+--- qpe-gaim.old/src/QGaimBListWindow.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimBListWindow.cpp 2005-02-28 23:22:29.000000000 +0100
+@@ -26,11 +26,10 @@
+ #include "QGaimMainWindow.h"
+ #include "base.h"
+
+-#include <libgaim/debug.h>
+-#include <libgaim/multi.h>
+-#include <libgaim/prefs.h>
+-#include <libgaim/request.h>
+-#include <libgaim/signals.h>
++#include <gaim/debug.h>
++#include <gaim/prefs.h>
++#include <gaim/request.h>
++#include <gaim/signals.h>
+
+ #include <qpe/resource.h>
+
+diff -ur qpe-gaim.old/src/QGaimBListWindow.h qpe-gaim/src/QGaimBListWindow.h
+--- qpe-gaim.old/src/QGaimBListWindow.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimBListWindow.h 2005-02-28 23:21:30.000000000 +0100
+@@ -21,7 +21,7 @@
+ #ifndef _QGAIM_BLIST_WIN_H_
+ #define _QGAIM_BLIST_WIN_H_
+
+-#include <libgaim/blist.h>
++#include <gaim/blist.h>
+
+ #include <qiconset.h>
+ #include <qmainwindow.h>
+diff -ur qpe-gaim.old/src/QGaimBuddyList.cpp qpe-gaim/src/QGaimBuddyList.cpp
+--- qpe-gaim.old/src/QGaimBuddyList.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimBuddyList.cpp 2005-02-28 23:24:27.000000000 +0100
+@@ -23,11 +23,10 @@
+ #include "QGaimProtocolUtils.h"
+ #include "QGaimImageUtils.h"
+
+-#include <libgaim/debug.h>
+-#include <libgaim/multi.h>
+-#include <libgaim/prefs.h>
+-#include <libgaim/request.h>
+-#include <libgaim/server.h>
++#include <gaim/debug.h>
++#include <gaim/prefs.h>
++#include <gaim/request.h>
++#include <gaim/server.h>
+
+ #include <qpe/qpeapplication.h>
+ #include <qpe/resource.h>
+@@ -132,7 +131,7 @@
+ setText(1, text);
+ }
+
+- setText(0, gaim_get_buddy_alias(buddy));
++ setText(0, gaim_buddy_get_alias(buddy));
+ }
+ else if (GAIM_BLIST_NODE_IS_BUDDY(node))
+ {
+@@ -166,7 +165,7 @@
+ }
+
+ setPixmap(0, QGaimBuddyList::getBuddyStatusIcon(node, pixmapSize));
+- setText(0, gaim_get_buddy_alias(buddy));
++ setText(0, gaim_buddy_get_alias(buddy));
+ setText(1, text);
+ }
+ else if (GAIM_BLIST_NODE_IS_CHAT(node))
+@@ -328,7 +327,7 @@
+ if (contact != NULL && !isExpanded() && contact->alias != NULL)
+ topText = contact->alias;
+ else
+- topText = gaim_get_buddy_alias(buddy);
++ topText = gaim_buddy_get_alias(buddy);
+
+ bottomText = statusText + idleTime + warning;
+
+diff -ur qpe-gaim.old/src/QGaimBuddyList.h qpe-gaim/src/QGaimBuddyList.h
+--- qpe-gaim.old/src/QGaimBuddyList.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimBuddyList.h 2005-02-28 23:21:30.000000000 +0100
+@@ -21,8 +21,8 @@
+ #ifndef _QGAIM_BUDDY_LIST_H_
+ #define _QGAIM_BUDDY_LIST_H_
+
+-#include <libgaim/account.h>
+-#include <libgaim/blist.h>
++#include <gaim/account.h>
++#include <gaim/blist.h>
+
+ #include <qlistview.h>
+
+diff -ur qpe-gaim.old/src/QGaimConnectionMeter.cpp qpe-gaim/src/QGaimConnectionMeter.cpp
+--- qpe-gaim.old/src/QGaimConnectionMeter.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimConnectionMeter.cpp 2005-02-28 23:21:30.000000000 +0100
+@@ -21,7 +21,7 @@
+ #include "QGaimConnectionMeter.h"
+ #include "QGaimProtocolUtils.h"
+
+-#include <libgaim/debug.h>
++#include <gaim/debug.h>
+
+ #include <qpushbutton.h>
+ #include <qlabel.h>
+diff -ur qpe-gaim.old/src/QGaimConnectionMeter.h qpe-gaim/src/QGaimConnectionMeter.h
+--- qpe-gaim.old/src/QGaimConnectionMeter.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimConnectionMeter.h 2005-02-28 23:21:30.000000000 +0100
+@@ -28,7 +28,7 @@
+ #include <qvariant.h>
+ #include <qvbox.h>
+
+-#include <libgaim/connection.h>
++#include <gaim/connection.h>
+
+ class QProgressBar;
+ class QVBox;
+diff -ur qpe-gaim.old/src/QGaimConvButton.cpp qpe-gaim/src/QGaimConvButton.cpp
+--- qpe-gaim.old/src/QGaimConvButton.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimConvButton.cpp 2005-02-28 23:21:30.000000000 +0100
+@@ -24,8 +24,8 @@
+ #include "QGaimMainWindow.h"
+ #include "base.h"
+
+-#include <libgaim/debug.h>
+-#include <libgaim/signals.h>
++#include <gaim/debug.h>
++#include <gaim/signals.h>
+
+ #include <qpe/resource.h>
+ #include <qpopupmenu.h>
+diff -ur qpe-gaim.old/src/QGaimConvButton.h qpe-gaim/src/QGaimConvButton.h
+--- qpe-gaim.old/src/QGaimConvButton.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimConvButton.h 2005-02-28 23:21:30.000000000 +0100
+@@ -25,7 +25,7 @@
+ #include <qwidget.h>
+ #include <qtoolbutton.h>
+
+-#include <libgaim/conversation.h>
++#include <gaim/conversation.h>
+
+ class QPopupMenu;
+
+diff -ur qpe-gaim.old/src/QGaimConvWindow.cpp qpe-gaim/src/QGaimConvWindow.cpp
+--- qpe-gaim.old/src/QGaimConvWindow.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimConvWindow.cpp 2005-02-28 23:34:33.000000000 +0100
+@@ -30,8 +30,8 @@
+ #include "QGaimMainWindow.h"
+ #include "base.h"
+
+-#include <libgaim/debug.h>
+-#include <libgaim/prefs.h>
++#include <gaim/debug.h>
++#include <gaim/prefs.h>
+
+ #include <qpe/resource.h>
+ #include <qpe/qpeapplication.h>
+@@ -1260,7 +1260,7 @@
+ }
+
+ static void
+-qGaimConvChatAddUser(GaimConversation *conv, const char *user)
++qGaimConvChatAddUser(GaimConversation *conv, const char *user, gboolean)
+ {
+ QGaimConvChat *qchat = (QGaimConvChat *)conv->ui_data;
+
+@@ -1321,6 +1321,7 @@
+ qGaimConvChatRemoveUsers,
+ NULL,
+ NULL,
++ NULL,
+ qGaimConvUpdated
+ };
+
+diff -ur qpe-gaim.old/src/QGaimConvWindow.h qpe-gaim/src/QGaimConvWindow.h
+--- qpe-gaim.old/src/QGaimConvWindow.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimConvWindow.h 2005-02-28 23:21:30.000000000 +0100
+@@ -25,7 +25,7 @@
+ #include <qwidget.h>
+ #include <qmainwindow.h>
+
+-#include <libgaim/conversation.h>
++#include <gaim/conversation.h>
+
+ class QAction;
+ class QGaimMultiLineEdit;
+diff -ur qpe-gaim.old/src/QGaimDebugWindow.cpp qpe-gaim/src/QGaimDebugWindow.cpp
+--- qpe-gaim.old/src/QGaimDebugWindow.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimDebugWindow.cpp 2005-02-28 23:21:30.000000000 +0100
+@@ -20,7 +20,7 @@
+ */
+ #include "QGaimDebugWindow.h"
+
+-#include <libgaim/debug.h>
++#include <gaim/debug.h>
+
+ #include <glib.h>
+ #include <stdio.h>
+diff -ur qpe-gaim.old/src/QGaimDebugWindow.h qpe-gaim/src/QGaimDebugWindow.h
+--- qpe-gaim.old/src/QGaimDebugWindow.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimDebugWindow.h 2005-02-28 23:21:30.000000000 +0100
+@@ -21,7 +21,7 @@
+ #ifndef _QGAIM_DEBUG_WIN_H_
+ #define _QGAIM_DEBUG_WIN_H_
+
+-#include <libgaim/debug.h>
++#include <gaim/debug.h>
+
+ GaimDebugUiOps *qGaimGetDebugUiOps(void);
+
+diff -ur qpe-gaim.old/src/QGaimDialogs.cpp qpe-gaim/src/QGaimDialogs.cpp
+--- qpe-gaim.old/src/QGaimDialogs.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimDialogs.cpp 2005-02-28 23:38:32.000000000 +0100
+@@ -21,11 +21,10 @@
+ #include "QGaimDialogs.h"
+ #include "QGaimAccountBox.h"
+
+-#include <libgaim/blist.h>
+-#include <libgaim/conversation.h>
+-#include <libgaim/multi.h>
+-#include <libgaim/notify.h>
+-#include <libgaim/prpl.h>
++#include <gaim/blist.h>
++#include <gaim/conversation.h>
++#include <gaim/notify.h>
++#include <gaim/prpl.h>
+
+ #include <qcombobox.h>
+ #include <qframe.h>
+@@ -336,7 +335,7 @@
+ }
+ else
+ {
+- QLineEdit *edit = new QLineEdit(pce->def, widgetsFrame);
++ QLineEdit *edit = new QLineEdit(pce->identifier, widgetsFrame);
+
+ grid->addWidget(edit, row, 1);
+
+@@ -614,7 +613,7 @@
+ }
+ else
+ {
+- QLineEdit *edit = new QLineEdit(pce->def, widgetsFrame);
++ QLineEdit *edit = new QLineEdit(pce->identifier, widgetsFrame);
+
+ grid->addWidget(edit, row, 1);
+
+diff -ur qpe-gaim.old/src/QGaimDialogs.h qpe-gaim/src/QGaimDialogs.h
+--- qpe-gaim.old/src/QGaimDialogs.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimDialogs.h 2005-02-28 23:21:30.000000000 +0100
+@@ -21,7 +21,7 @@
+ #ifndef _QGAIM_DIALOGS_H_
+ #define _QGAIM_DIALOGS_H_
+
+-#include <libgaim/account.h>
++#include <gaim/account.h>
+
+ #include <qdialog.h>
+ #include <qlist.h>
+diff -ur qpe-gaim.old/src/QGaimEventLoop.cpp qpe-gaim/src/QGaimEventLoop.cpp
+--- qpe-gaim.old/src/QGaimEventLoop.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimEventLoop.cpp 2005-03-03 22:59:49.000000000 +0100
+@@ -38,8 +38,8 @@
+ static guint nextSourceId = 0;
+ static QIntDict<QGaimSourceInfo> sources;
+
+-QGaimTimer::QGaimTimer(guint sourceId, GSourceFunc func, gpointer data)
+- : QTimer(), sourceId(sourceId), func(func), userData(data)
++QGaimTimer::QGaimTimer(guint _sourceId, GSourceFunc func, gpointer data)
++ : QTimer(), sourceId(_sourceId), func(func), userData(data)
+ {
+ connect(this, SIGNAL(timeout()),
+ this, SLOT(update()));
+Nur in qpe-gaim/src: QGaimEventLoop.cpp~.
+diff -ur qpe-gaim.old/src/QGaimEventLoop.h qpe-gaim/src/QGaimEventLoop.h
+--- qpe-gaim.old/src/QGaimEventLoop.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimEventLoop.h 2005-02-28 23:21:30.000000000 +0100
+@@ -21,7 +21,7 @@
+ #ifndef _QGAIM_EVENT_LOOP_H_
+ #define _QGAIM_EVENT_LOOP_H_
+
+-#include <libgaim/eventloop.h>
++#include <gaim/eventloop.h>
+
+ #include <qtimer.h>
+ #include <qsocketnotifier.h>
+diff -ur qpe-gaim.old/src/QGaimImageUtils.cpp qpe-gaim/src/QGaimImageUtils.cpp
+--- qpe-gaim.old/src/QGaimImageUtils.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimImageUtils.cpp 2005-02-28 23:21:30.000000000 +0100
+@@ -20,7 +20,7 @@
+ */
+ #include "QGaimImageUtils.h"
+
+-#include <libgaim/debug.h>
++#include <gaim/debug.h>
+
+ #include <glib.h>
+
+diff -ur qpe-gaim.old/src/QGaimMainWindow.cpp qpe-gaim/src/QGaimMainWindow.cpp
+--- qpe-gaim.old/src/QGaimMainWindow.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimMainWindow.cpp 2005-03-01 00:31:54.000000000 +0100
+@@ -25,13 +25,13 @@
+ #include <qvbox.h>
+ #include <qpe/qpeapplication.h>
+
+-#include <libgaim/prefs.h>
+-#include <libgaim/conversation.h>
+-#include <libgaim/core.h>
+-#include <libgaim/proxy.h>
+-#include <libgaim/sound.h>
+-#include <libgaim/pounce.h>
+-#include <libgaim/plugin.h>
++#include <gaim/prefs.h>
++#include <gaim/conversation.h>
++#include <gaim/core.h>
++#include <gaim/proxy.h>
++#include <gaim/sound.h>
++#include <gaim/pounce.h>
++#include <gaim/plugin.h>
+
+ #include "QGaimConnectionMeter.h"
+ #include "QGaimConvWindow.h"
+@@ -145,7 +145,7 @@
+ void
+ QGaimMainWindow::initCore()
+ {
+- char *plugin_search_paths[1];
++ char *plugin_search_paths[2];
+
+ gaim_core_set_ui_ops(qGaimGetCoreUiOps());
+ gaim_eventloop_set_ui_ops(qGaimGetEventLoopUiOps());
+@@ -155,11 +155,8 @@
+ "Please report this!\n"));
+ }
+
+-#ifdef LOCAL_COMPILE
+ plugin_search_paths[0] = "/opt/Qtopia/lib/gaim";
+-#else
+- plugin_search_paths[0] = "/usr/lib/gaim";
+-#endif
++ plugin_search_paths[1] = "/usr/lib/gaim";
+
+ gaim_plugins_set_search_paths(sizeof(plugin_search_paths) /
+ sizeof(*plugin_search_paths),
+diff -ur qpe-gaim.old/src/QGaimMainWindow.h qpe-gaim/src/QGaimMainWindow.h
+--- qpe-gaim.old/src/QGaimMainWindow.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimMainWindow.h 2005-02-28 23:21:30.000000000 +0100
+@@ -24,7 +24,7 @@
+ #include <qmainwindow.h>
+ #include <qwidgetstack.h>
+
+-#include <libgaim/conversation.h>
++#include <gaim/conversation.h>
+
+ #include "QGaimBListWindow.h"
+
+diff -ur qpe-gaim.old/src/QGaimNotify.cpp qpe-gaim/src/QGaimNotify.cpp
+--- qpe-gaim.old/src/QGaimNotify.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimNotify.cpp 2005-02-28 23:42:01.000000000 +0100
+@@ -20,7 +20,7 @@
+ */
+ #include "QGaimNotify.h"
+
+-#include <libgaim/prefs.h>
++#include <gaim/prefs.h>
+
+ #include <qdialog.h>
+ #include <qlabel.h>
+@@ -28,9 +28,9 @@
+ #include <qmessagebox.h>
+ #include <qtextview.h>
+
+-#include <opie/odevice.h>
++#include <opie2/odevice.h>
+
+-using namespace Opie;
++using namespace Opie::Core;
+
+ static int notifyActiveCount = 0;
+
+@@ -215,7 +215,7 @@
+ if (!gaim_prefs_get_bool("/gaim/qpe/notify/use_buzzer"))
+ return;
+
+- ODevice::inst()->alarmSound();
++ ODevice::inst()->playAlarmSound();
+ }
+
+ void
+Nur in qpe-gaim/src: QGaimNotify.cpp.rej.
+diff -ur qpe-gaim.old/src/QGaimNotify.h qpe-gaim/src/QGaimNotify.h
+--- qpe-gaim.old/src/QGaimNotify.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimNotify.h 2005-02-28 23:21:30.000000000 +0100
+@@ -21,7 +21,7 @@
+ #ifndef _QGAIM_NOTIFY_H_
+ #define _QGAIM_NOTIFY_H_
+
+-#include <libgaim/notify.h>
++#include <gaim/notify.h>
+
+ GaimNotifyUiOps *qGaimGetNotifyUiOps();
+
+diff -ur qpe-gaim.old/src/QGaimPrefsDialog.cpp qpe-gaim/src/QGaimPrefsDialog.cpp
+--- qpe-gaim.old/src/QGaimPrefsDialog.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimPrefsDialog.cpp 2005-02-28 23:42:01.000000000 +0100
+@@ -21,8 +21,8 @@
+ #include "QGaimPrefsDialog.h"
+ #include "QGaimMainWindow.h"
+
+-#include <libgaim/debug.h>
+-#include <libgaim/prefs.h>
++#include <gaim/debug.h>
++#include <gaim/prefs.h>
+
+ #include <qcheckbox.h>
+ #include <qlabel.h>
+@@ -30,8 +30,8 @@
+ #include <qvbox.h>
+ #include <qvgroupbox.h>
+
+-#include <opie/otabwidget.h>
+-#include <opie/owait.h>
++#include <opie2/otabwidget.h>
++#include <opie2/owait.h>
+
+ #include <qpe/resource.h>
+
+@@ -306,7 +306,7 @@
+ layout = new QVBoxLayout(this);
+ layout->setAutoAdd(true);
+
+- tabs = new OTabWidget(this, "pref tabs");
++ tabs = new Opie::Ui::OTabWidget(this, "pref tabs");
+
+ blistPage = new QGaimBlistPrefPage(this, "blist page");
+ notifyPage = new QGaimNotifyPrefPage(this, "notify page");
+@@ -332,7 +332,7 @@
+ void
+ QGaimPrefsDialog::accept()
+ {
+- OWait wait(this);
++ Opie::Ui::OWait wait(this);
+
+ wait.show();
+
+diff -ur qpe-gaim.old/src/QGaimPrefsDialog.h qpe-gaim/src/QGaimPrefsDialog.h
+--- qpe-gaim.old/src/QGaimPrefsDialog.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimPrefsDialog.h 2005-02-28 23:42:01.000000000 +0100
+@@ -22,8 +22,8 @@
+ #define _QGAIM_PREFS_DIALOG_H_
+
+ #include <qdialog.h>
++#include <opie2/otabwidget.h>
+
+-class OTabWidget;
+ class QCheckBox;
+
+ class QGaimPrefPage : public QWidget
+@@ -150,7 +150,7 @@
+ void buildInterface();
+
+ private:
+- OTabWidget *tabs;
++ Opie::Ui::OTabWidget *tabs;
+
+ QGaimPrefPage *blistPage;
+ QGaimPrefPage *convPage;
+diff -ur qpe-gaim.old/src/QGaimProtocolBox.cpp qpe-gaim/src/QGaimProtocolBox.cpp
+--- qpe-gaim.old/src/QGaimProtocolBox.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimProtocolBox.cpp 2005-02-28 23:21:30.000000000 +0100
+@@ -21,7 +21,7 @@
+ #include "QGaimProtocolBox.h"
+ #include "QGaimProtocolUtils.h"
+
+-#include <libgaim/debug.h>
++#include <gaim/debug.h>
+
+ #include <qpixmap.h>
+
+diff -ur qpe-gaim.old/src/QGaimProtocolBox.h qpe-gaim/src/QGaimProtocolBox.h
+--- qpe-gaim.old/src/QGaimProtocolBox.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimProtocolBox.h 2005-02-28 23:21:30.000000000 +0100
+@@ -24,7 +24,7 @@
+ #include <qvariant.h>
+ #include <qcombobox.h>
+
+-#include <libgaim/prpl.h>
++#include <gaim/prpl.h>
+
+ class QGaimProtocolBox : public QComboBox
+ {
+diff -ur qpe-gaim.old/src/QGaimProtocolUtils.h qpe-gaim/src/QGaimProtocolUtils.h
+--- qpe-gaim.old/src/QGaimProtocolUtils.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimProtocolUtils.h 2005-02-28 23:21:30.000000000 +0100
+@@ -23,9 +23,9 @@
+
+ #include <qvariant.h>
+
+-#include <libgaim/account.h>
+-#include <libgaim/plugin.h>
+-#include <libgaim/prpl.h>
++#include <gaim/account.h>
++#include <gaim/plugin.h>
++#include <gaim/prpl.h>
+
+ #include "QGaimImageUtils.h"
+
+diff -ur qpe-gaim.old/src/QGaimRequest.cpp qpe-gaim/src/QGaimRequest.cpp
+--- qpe-gaim.old/src/QGaimRequest.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimRequest.cpp 2005-02-28 23:21:30.000000000 +0100
+@@ -22,7 +22,7 @@
+ #include "QGaimInputDialog.h"
+ #include "QGaimMainWindow.h"
+
+-#include <libgaim/debug.h>
++#include <gaim/debug.h>
+
+ #include <qmessagebox.h>
+
+diff -ur qpe-gaim.old/src/QGaimRequest.h qpe-gaim/src/QGaimRequest.h
+--- qpe-gaim.old/src/QGaimRequest.h 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimRequest.h 2005-02-28 23:21:30.000000000 +0100
+@@ -21,7 +21,7 @@
+ #ifndef _QGAIM_REQUEST_H_
+ #define _QGAIM_REQUEST_H_
+
+-#include <libgaim/request.h>
++#include <gaim/request.h>
+
+ GaimRequestUiOps *qGaimGetRequestUiOps();
+
+diff -ur qpe-gaim.old/src/QGaimTabBar.cpp qpe-gaim/src/QGaimTabBar.cpp
+--- qpe-gaim.old/src/QGaimTabBar.cpp 2004-10-30 20:08:06.000000000 +0200
++++ qpe-gaim/src/QGaimTabBar.cpp 2005-02-28 23:21:30.000000000 +0100
+@@ -20,7 +20,7 @@
+ */
+ #include "QGaimTabBar.h"
+
+-#include <libgaim/debug.h>
++#include <gaim/debug.h>
+
+ /**************************************************************************
+ * QGaimTabBar
+Nur in qpe-gaim/src: semantic.cache.
+Nur in qpe-gaim/src: semantic.cache~.
diff --git a/recipes-qtopia/qpe-gaim/files/vit.patch b/recipes-qtopia/qpe-gaim/files/vit.patch
new file mode 100644
index 0000000..fa48050
--- /dev/null
+++ b/recipes-qtopia/qpe-gaim/files/vit.patch
@@ -0,0 +1,327 @@
+Index: qpe-gaim/src/QGaimAccountsWindow.cpp
+===================================================================
+--- qpe-gaim.orig/src/QGaimAccountsWindow.cpp 2005-03-06 21:16:47.098868556 +0100
++++ qpe-gaim/src/QGaimAccountsWindow.cpp 2005-03-06 21:16:47.353832369 +0100
+@@ -40,6 +40,7 @@
+ #include <qtimer.h>
+ #include <qtoolbar.h>
+ #include <qtoolbutton.h>
++#include <qmessagebox.h>
+
+ /**************************************************************************
+ * QGaimAccountListItem
+@@ -525,7 +526,7 @@
+ if (meter == NULL)
+ meter = meters->addConnection(gc);
+
+- meter->update(QString(text), step, step_count);
++ meter->update(QString::fromUtf8(text), step, step_count);
+ }
+
+ static void
+@@ -553,11 +554,19 @@
+ }
+
+ static void
++qGaimReportDisconnected(GaimConnection *gc, const char *text)
++{
++// if (QMessageBox::critical (NULL, "Disconnected", QString("<p>")+text+QString("</p>"), "Retry", "Cancel") == 0)
++ QMessageBox::critical (NULL, "Disconnected", QString("<p>")+text+QString("</p>"));
++}
++
++static void
+ qGaimConnNotice(GaimConnection *gc, const char *text)
+ {
+ /* XXX */
+ gc = NULL;
+ text = NULL;
++// QMessageBox::information (NULL, "Notice", QString::fromUtf8(text));
+ }
+
+ static GaimConnectionUiOps connUiOps =
+@@ -566,7 +575,7 @@
+ qGaimConnConnected,
+ qGaimConnDisconnected,
+ qGaimConnNotice,
+- NULL
++ qGaimReportDisconnected
+ };
+
+ GaimConnectionUiOps *
+Index: qpe-gaim/src/QGaimBListWindow.cpp
+===================================================================
+--- qpe-gaim.orig/src/QGaimBListWindow.cpp 2005-03-06 21:16:47.099868414 +0100
++++ qpe-gaim/src/QGaimBListWindow.cpp 2005-03-06 21:16:47.354832227 +0100
+@@ -428,7 +428,7 @@
+ dialog = new QGaimAddBuddyDialog(this, "", true);
+
+ if (group != NULL)
+- dialog->setGroup(group->name);
++ dialog->setGroup(QString::fromUtf8(group->name));
+
+ dialog->showMaximized();
+ }
+@@ -469,7 +469,7 @@
+ dialog = new QGaimAddChatDialog(this, "", true);
+
+ if (group != NULL)
+- dialog->setGroup(group->name);
++ dialog->setGroup(QString::fromUtf8(group->name));
+
+ dialog->showMaximized();
+ }
+Index: qpe-gaim/src/QGaimBuddyList.cpp
+===================================================================
+--- qpe-gaim.orig/src/QGaimBuddyList.cpp 2005-03-06 21:16:47.101868130 +0100
++++ qpe-gaim/src/QGaimBuddyList.cpp 2005-03-06 21:18:39.073975291 +0100
+@@ -131,7 +131,7 @@
+ setText(1, text);
+ }
+
+- setText(0, gaim_buddy_get_alias(buddy));
++ setText(0, QString::fromUtf8(gaim_buddy_get_alias(buddy)));
+ }
+ else if (GAIM_BLIST_NODE_IS_BUDDY(node))
+ {
+@@ -164,8 +164,8 @@
+ text += idle;
+ }
+
+- setPixmap(0, QGaimBuddyList::getBuddyStatusIcon(node, pixmapSize));
+- setText(0, gaim_buddy_get_alias(buddy));
++ setPixmap(0, QGaimBuddyList::getBuddyStatusIcon(node, pixmapSize));
++ setText(0, QString::fromUtf8(gaim_buddy_get_alias(buddy)));
+ setText(1, text);
+ }
+ else if (GAIM_BLIST_NODE_IS_CHAT(node))
+@@ -325,9 +325,9 @@
+ statusText = QObject::tr("Offline ");
+
+ if (contact != NULL && !isExpanded() && contact->alias != NULL)
+- topText = contact->alias;
++ topText = QString::fromUtf8(contact->alias);
+ else
+- topText = gaim_buddy_get_alias(buddy);
++ topText = QString::fromUtf8(gaim_buddy_get_alias(buddy));
+
+ bottomText = statusText + idleTime + warning;
+
+@@ -401,7 +401,7 @@
+ QString groupName, detail;
+ QFont f = p->font();
+
+- groupName = group->name;
++ groupName = QString::fromUtf8(group->name);
+
+ if (gaim_prefs_get_bool("/gaim/qpe/blist/show_group_count"))
+ {
+Index: qpe-gaim/src/QGaimConnectionMeter.cpp
+===================================================================
+--- qpe-gaim.orig/src/QGaimConnectionMeter.cpp 2005-03-06 21:16:47.101868130 +0100
++++ qpe-gaim/src/QGaimConnectionMeter.cpp 2005-03-06 21:16:47.355832086 +0100
+@@ -74,14 +74,12 @@
+ }
+
+ void
+-QGaimConnectionMeter::update(QString, int progress, int totalSteps)
++QGaimConnectionMeter::update(QString str, int progress, int totalSteps)
+ {
+ if (progress == 0)
+ progressBar->setTotalSteps(totalSteps);
+
+ progressBar->setProgress(progress);
+-
+-// progressBar->setIndicator(str, progress, totalSteps);
+ }
+
+ GaimConnection *
+Index: qpe-gaim/src/QGaimConvWindow.cpp
+===================================================================
+--- qpe-gaim.orig/src/QGaimConvWindow.cpp 2005-03-06 21:16:47.103867846 +0100
++++ qpe-gaim/src/QGaimConvWindow.cpp 2005-03-06 21:16:47.357831802 +0100
+@@ -93,7 +93,7 @@
+ if (flags & GAIM_MESSAGE_SYSTEM)
+ {
+ txt = "<b>";
+- txt += message;
++ txt += QString::fromUtf8(message);
+ txt += "</b><br>\n";
+ }
+ else
+@@ -109,13 +109,13 @@
+ if (meify(newMessage, length))
+ {
+ nick = "***";
+- nick += who;
++ nick += QString::fromUtf8(who);
+ color = "#6C2585";
+ }
+ else
+ {
+ nick = "*";
+- nick += who;
++ nick += QString::fromUtf8(who);
+ nick += "*:";
+ color = "#00FF00";
+ }
+@@ -129,7 +129,7 @@
+ else
+ nick = "***";
+
+- nick += who;
++ nick += QString::fromUtf8(who);
+
+ if (flags & GAIM_MESSAGE_NICK)
+ color = "#AF7F00";
+@@ -138,7 +138,7 @@
+ }
+ else
+ {
+- nick = who;
++ nick = QString::fromUtf8(who);
+
+ if (flags & GAIM_MESSAGE_AUTO_RESP)
+ nick += "&lt;AUTO-REPLY&gt; :";
+@@ -158,7 +158,7 @@
+ txt += nick;
+ txt += "</b></font> ";
+
+- txt += stripFontFace(newMessage);
++ txt += stripFontFace(QString::fromUtf8(newMessage));
+ txt += "<br>\n";
+
+ g_free(newMessage);
+@@ -353,7 +353,7 @@
+ else
+ item->setText(0, " ");
+
+- item->setText(1, user);
++ item->setText(1, QString::fromUtf8(user));
+ userList->insertItem(item);
+ }
+
+@@ -373,9 +373,9 @@
+ item != NULL;
+ item = item->nextSibling())
+ {
+- if (item->text(1) == oldName)
++ if (item->text(1) == QString::fromUtf8(oldName))
+ {
+- item->setText(1, newName);
++ item->setText(1, QString::fromUtf8(newName));
+ break;
+ }
+ }
+@@ -390,7 +390,7 @@
+ item != NULL;
+ item = item->nextSibling())
+ {
+- if (item->text(1) == user)
++ if (item->text(1) == QString::fromUtf8(user))
+ {
+ delete item;
+ break;
+@@ -473,7 +473,7 @@
+ if (text[text.length() - 1] == '\n')
+ text.remove(text.length() - 1, 1);
+
+- gaim_conv_chat_send(GAIM_CONV_CHAT(conv), text);
++ gaim_conv_chat_send(GAIM_CONV_CHAT(conv), text.utf8());
+
+ entry->setText("");
+ }
+@@ -650,7 +650,7 @@
+ if (text[text.length() - 1] == '\n')
+ text.remove(text.length() - 1, 1);
+
+- gaim_conv_im_send(GAIM_CONV_IM(conv), text);
++ gaim_conv_im_send(GAIM_CONV_IM(conv), text.utf8());
+
+ entry->setText("");
+
+@@ -995,7 +995,7 @@
+ int result = QMessageBox::information(this,
+ tr("Remove Buddy"),
+ tr("<p>You are about to remove %1 from your buddy list.</p>\n"
+- "<p>Do you want to continue?</p>").arg(name),
++ "<p>Do you want to continue?</p>").arg(QString::fromUtf8(name)),
+ tr("&Remove Buddy"), tr("&Cancel"),
+ QString::null, 1, 1);
+
+Index: qpe-gaim/src/QGaimDialogs.cpp
+===================================================================
+--- qpe-gaim.orig/src/QGaimDialogs.cpp 2005-03-06 21:16:47.105867562 +0100
++++ qpe-gaim/src/QGaimDialogs.cpp 2005-03-06 21:16:47.358831660 +0100
+@@ -141,7 +141,7 @@
+ {
+ GaimGroup *g = (GaimGroup *)node;
+
+- groupCombo->insertItem(g->name);
++ groupCombo->insertItem(QString::fromUtf8(g->name));
+ }
+ }
+ }
+@@ -151,9 +151,9 @@
+ QGaimAddBuddyDialog::accept()
+ {
+ GaimConversation *conv;
+- QString screenname = screenNameEntry->text();
+- QString alias = aliasEntry->text();
+- QString group_name = groupCombo->currentText();
++ QString screenname = screenNameEntry->text().utf8();
++ QString alias = aliasEntry->text().utf8();
++ QString group_name = groupCombo->currentText().utf8();
+ GaimAccount *account;
+ GaimBuddy *buddy;
+ GaimGroup *group;
+@@ -290,7 +290,7 @@
+ {
+ GaimGroup *g = (GaimGroup *)node;
+
+- groupCombo->insertItem(g->name);
++ groupCombo->insertItem(QString::fromUtf8(g->name));
+ }
+ }
+ }
+@@ -371,8 +371,8 @@
+ GaimGroup *group;
+ GList *chatInfoList, *l;
+ GHashTable *components;
+- QString alias = aliasEntry->text();
+- QString groupName = groupCombo->currentText();
++ QString alias = aliasEntry->text().utf8();
++ QString groupName = groupCombo->currentText().utf8();
+ QWidget *widget;
+ struct proto_chat_entry *pce;
+
+@@ -495,7 +495,7 @@
+ void
+ QGaimNewImDialog::accept()
+ {
+- QString screenname = screenNameEntry->text();
++ QString screenname = screenNameEntry->text().utf8();
+ GaimAccount *account;
+ GaimConversation *conv;
+
+Index: qpe-gaim/src/QGaimRequest.cpp
+===================================================================
+--- qpe-gaim.orig/src/QGaimRequest.cpp 2005-03-06 21:16:47.109866995 +0100
++++ qpe-gaim/src/QGaimRequest.cpp 2005-03-06 21:16:47.358831660 +0100
+@@ -68,7 +68,7 @@
+ dialog->setInfoText(message);
+
+ if (defaultValue != NULL)
+- dialog->setDefaultValue(defaultValue);
++ dialog->setDefaultValue(QString::fromUtf8(defaultValue));
+
+ if (masked)
+ dialog->setMasked();
+@@ -85,7 +85,7 @@
+ if (result == 1)
+ {
+ if (okCb != NULL)
+- ((GaimRequestInputCb)okCb)(userData, dialog->getText());
++ ((GaimRequestInputCb)okCb)(userData, dialog->getText().utf8());
+ }
+ else if (cancelCb != NULL)
+ ((GaimRequestInputCb)cancelCb)(userData, NULL);
diff --git a/recipes-qtopia/qpe-gaim/qpe-gaim_20041030.bb b/recipes-qtopia/qpe-gaim/qpe-gaim_20041030.bb
new file mode 100644
index 0000000..e856b37
--- /dev/null
+++ b/recipes-qtopia/qpe-gaim/qpe-gaim_20041030.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "A multi protocol instant messager application, Qt/Embedded based Palmtop Environments Edition"
+SECTION = "opie/applications"
+DEPENDS = "qpe-libgaim glib-2.0"
+RDEPENDS_${PN} = "libgaim-plugins glibc-gconv-iso8859-1"
+LICENSE = "GPL"
+HOMEPAGE = "http://qpe-gaim.sourceforge.net/"
+APPNAME = "gaim"
+APPTYPE = "binary"
+LICENSE = "GPL"
+APPDESKTOP = "${S}"
+PR = "r3"
+
+SRC_URI = "http://www.vanille.de/mirror/qpe-gaim_20041030.tar.bz2 \
+ file://qpe-gaim.patch \
+ file://buzzer-notification.patch \
+ file://vit.patch"
+S = "${WORKDIR}/qpe-gaim"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST +="INCLUDEPATH-=${includedir}/glib-2.0 \
+ INCLUDEPATH-=${libdir}/glib-2.0/include \
+ INCLUDEPATH+=${STAGING_INCDIR}/glib-2.0 \
+ LIBS-=-lopie LIBS+=-lopiecore2 LIBS+=-lopieui2"
+
+do_configure_prepend() {
+ ln -s ../libgaim/src libgaim
+}
+
+do_install() {
+ for dir in 16x16 32x32 protocols status
+ do
+ install -d ${D}${palmtopdir}/pics/gaim/${dir}
+ install -m 0644 data/images/${dir}/*.png ${D}${palmtopdir}/pics/gaim/${dir}/
+ done
+ install -m 0644 gaim.png ${D}${palmtopdir}/pics/
+}
+
+SRC_URI[md5sum] = "b61c7005301956e231feacff707c7b19"
+SRC_URI[sha256sum] = "0b55004666e3353feef384c5795a05b5bf1a3b69a487aee5b8f8e9d66c133b86"
diff --git a/recipes-qtopia/qpe-gaim/qpe-libgaim_1.5.0.bb b/recipes-qtopia/qpe-gaim/qpe-libgaim_1.5.0.bb
new file mode 100644
index 0000000..4bb687a
--- /dev/null
+++ b/recipes-qtopia/qpe-gaim/qpe-libgaim_1.5.0.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "A multi protocol instant messager library, Qt/Embedded based Palmtop Environments Edition"
+SECTION = "opie/applications"
+DEPENDS = "glib-2.0 gnutls"
+RDEPENDS_${PN} = "libgaim-plugins"
+LICENSE = "GPL"
+HOMEPAGE = "http://gaim.sourceforge.net/"
+PR = "r5"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gaim/gaim-${PV}.tar.bz2 \
+ file://dont-look-for-gtk.patch \
+ file://libgaim.patch "
+
+S = "${WORKDIR}/gaim-${PV}"
+
+inherit autotools
+
+EXTRA_OE_CONF = "--disable-audio --disable-gtkspell --disable-perl \
+ --disable-screensaver --disable-sm --disable-glibtest \
+ --disable-gtktest --disable-startup-notification \
+ --disable-gevolution --disable-aotest --disable-audiofiletest \
+ --disable-x --without-x --without-gtk --disable-gtk \
+ --enable-gnutls=y"
+
+CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_LIBDIR}/glib-2.0/include"
+
+do_stage() {
+ oe_libinstall -so -C src libgaim ${QTDIR}/lib
+
+ # install headers
+ GAIM_DIR=${STAGING_INCDIR}/gaim
+ install -d $GAIM_DIR
+
+ for header in account.h accountopt.h away.h blist.h buddyicon.h cmds.h config.h connection.h conversation.h core.h debug.h eventloop.h ft.h gaim.h imgstore.h log.h md5.h network.h notify.h plugin.h pluginpref.h pounce.h prefix.h prefs.h privacy.h proxy.h prpl.h request.h roomlist.h server.h sha.h signals.h sound.h sslconn.h status.h stringref.h util.h value.h version.h xmlnode.h
+ do
+ if [ -e ${S}/src/$header ]; then
+ install -m 0644 ${S}/src/$header $GAIM_DIR
+ fi
+ if [ -e ${S}/$header ]; then
+ install -m 0644 ${S}/$header $GAIM_DIR
+ fi
+ done
+}
+
+PACKAGES_DYNAMIC = "libgaim-protocol-*"
+
+#FIXME: use do_packages to create individual packages for each of the plugins
+python populate_packages_prepend () {
+ plugindir = bb.data.expand('${libdir}/gaim', d)
+ do_split_packages(d, plugindir, '^lib(.*)\.so$', 'libgaim-protocol-%s', 'GAIM plugin for %s protocol', extra_depends='' )
+}
+
+PACKAGES += "libgaim-plugins"
+FILES_libgaim-plugins = "${libdir}/gaim/autorecon.so ${libdir}/gaim/s*.so"
+
+
+SRC_URI[md5sum] = "9205321ac11fad271c90f2f0d7c5e7ce"
+SRC_URI[sha256sum] = "58e3b0340cfc9e54e46f8d8835e5a02e31201c9ed8820bbb4cea36c59b9682aa"