2 diff -ur qpe-gaim.old/gaim.pro qpe-gaim/gaim.pro
3 --- qpe-gaim.old/gaim.pro 2004-10-30 20:08:11.000000000 +0200
4 +++ qpe-gaim/gaim.pro 2005-03-03 23:04:20.000000000 +0100
10 + $(OPIEDIR)/include \
11 + /home/ich/programming/oe/gaim/libgaim_install/include \
12 /usr/include/glib-2.0 \
13 /usr/lib/glib-2.0/include
15 -DEPENDPATH += $(QPEDIR)/include
16 +DEPENDPATH += $(OPIEDIR)/include
28 +LIBRARYPATH += $(OPIEDIR)/lib
29 +LIBPATH += $(OPIEDIR)/lib
33 diff -ur qpe-gaim.old/src/main.cpp qpe-gaim/src/main.cpp
34 --- qpe-gaim.old/src/main.cpp 2004-10-30 20:08:06.000000000 +0200
35 +++ qpe-gaim/src/main.cpp 2005-02-28 23:57:59.000000000 +0100
38 #include "QGaimMainWindow.h"
40 -#include <qpe/qpeapplication.h>
41 -#include <opie/oapplicationfactory.h>
45 + * Variables needed to be defined
47 +GSList *away_messages = NULL;
48 +GSList *unread_message_queue = NULL;
49 +GSList *message_queue = NULL;
50 +int docklet_count = 0;
51 +struct away_message *awaymessage = NULL;
54 +void *awayqueue = NULL;
55 +void *awayquestore = NULL;
57 +gint check_idle(gpointer data)
64 +char *stylize(const gchar *text, int length)
66 + gchar *buf = (gchar*)g_malloc(length);
67 + g_snprintf(buf, length, "%s", text );
72 +#include <opie2/oapplicationfactory.h>
73 +using namespace Opie::Core;
75 OPIE_EXPORT_APP(OApplicationFactory<QGaimMainWindow>)
76 Nur in qpe-gaim/src: main.cpp~.
77 diff -ur qpe-gaim.old/src/QGaimAccountBox.cpp qpe-gaim/src/QGaimAccountBox.cpp
78 --- qpe-gaim.old/src/QGaimAccountBox.cpp 2004-10-30 20:08:06.000000000 +0200
79 +++ qpe-gaim/src/QGaimAccountBox.cpp 2005-02-28 23:21:30.000000000 +0100
81 #include "QGaimAccountBox.h"
82 #include "QGaimProtocolUtils.h"
84 -#include <libgaim/debug.h>
85 +#include <gaim/debug.h>
89 diff -ur qpe-gaim.old/src/QGaimAccountBox.h qpe-gaim/src/QGaimAccountBox.h
90 --- qpe-gaim.old/src/QGaimAccountBox.h 2004-10-30 20:08:06.000000000 +0200
91 +++ qpe-gaim/src/QGaimAccountBox.h 2005-02-28 23:21:30.000000000 +0100
94 #include <qcombobox.h>
96 -#include <libgaim/account.h>
97 +#include <gaim/account.h>
99 class QGaimAccountBox : public QComboBox
101 diff -ur qpe-gaim.old/src/QGaimAccountEditor.cpp qpe-gaim/src/QGaimAccountEditor.cpp
102 --- qpe-gaim.old/src/QGaimAccountEditor.cpp 2004-10-30 20:08:06.000000000 +0200
103 +++ qpe-gaim/src/QGaimAccountEditor.cpp 2005-02-28 23:21:30.000000000 +0100
105 #include "QGaimTabWidget.h"
108 -#include <libgaim/accountopt.h>
109 -#include <libgaim/debug.h>
110 +#include <gaim/accountopt.h>
111 +#include <gaim/debug.h>
113 #include <qcheckbox.h>
114 #include <qcombobox.h>
115 diff -ur qpe-gaim.old/src/QGaimAccountEditor.h qpe-gaim/src/QGaimAccountEditor.h
116 --- qpe-gaim.old/src/QGaimAccountEditor.h 2004-10-30 20:08:06.000000000 +0200
117 +++ qpe-gaim/src/QGaimAccountEditor.h 2005-02-28 23:21:30.000000000 +0100
119 #ifndef _QGAIM_ACCOUNT_EDITOR_H_
120 #define _QGAIM_ACCOUNT_EDITOR_H_
122 -#include <libgaim/account.h>
123 -#include <libgaim/plugin.h>
124 -#include <libgaim/prpl.h>
125 +#include <gaim/account.h>
126 +#include <gaim/plugin.h>
127 +#include <gaim/prpl.h>
131 diff -ur qpe-gaim.old/src/QGaimAccountsWindow.cpp qpe-gaim/src/QGaimAccountsWindow.cpp
132 --- qpe-gaim.old/src/QGaimAccountsWindow.cpp 2004-10-30 20:08:06.000000000 +0200
133 +++ qpe-gaim/src/QGaimAccountsWindow.cpp 2005-03-03 23:03:50.000000000 +0100
135 #include "QGaimMainWindow.h"
138 -#include <libgaim/prpl.h>
139 -#include <libgaim/signals.h>
140 +#include <gaim/prpl.h>
141 +#include <gaim/signals.h>
143 #include <qpe/resource.h>
147 QGaimAccountsWindow::connectToAccount()
149 + if ( !accountsView->selectedItem() )
153 QGaimAccountListItem *item;
155 connectButton->setEnabled(false);
158 QGaimAccountsWindow::disconnectFromAccount()
160 + if ( !accountsView->selectedItem() )
163 QGaimAccountListItem *item;
165 item = (QGaimAccountListItem *)accountsView->selectedItem();
166 Nur in qpe-gaim/src: QGaimAccountsWindow.cpp~.
167 diff -ur qpe-gaim.old/src/QGaimAccountsWindow.h qpe-gaim/src/QGaimAccountsWindow.h
168 --- qpe-gaim.old/src/QGaimAccountsWindow.h 2004-10-30 20:08:06.000000000 +0200
169 +++ qpe-gaim/src/QGaimAccountsWindow.h 2005-02-28 23:21:30.000000000 +0100
171 #ifndef _QGAIM_ACCOUNTS_WINDOW_H_
172 #define _QGAIM_ACCOUNTS_WINDOW_H_
174 -#include <libgaim/prpl.h>
175 +#include <gaim/prpl.h>
177 #include <qvariant.h>
179 diff -ur qpe-gaim.old/src/QGaimBListWindow.cpp qpe-gaim/src/QGaimBListWindow.cpp
180 --- qpe-gaim.old/src/QGaimBListWindow.cpp 2004-10-30 20:08:06.000000000 +0200
181 +++ qpe-gaim/src/QGaimBListWindow.cpp 2005-02-28 23:22:29.000000000 +0100
183 #include "QGaimMainWindow.h"
186 -#include <libgaim/debug.h>
187 -#include <libgaim/multi.h>
188 -#include <libgaim/prefs.h>
189 -#include <libgaim/request.h>
190 -#include <libgaim/signals.h>
191 +#include <gaim/debug.h>
192 +#include <gaim/prefs.h>
193 +#include <gaim/request.h>
194 +#include <gaim/signals.h>
196 #include <qpe/resource.h>
198 diff -ur qpe-gaim.old/src/QGaimBListWindow.h qpe-gaim/src/QGaimBListWindow.h
199 --- qpe-gaim.old/src/QGaimBListWindow.h 2004-10-30 20:08:06.000000000 +0200
200 +++ qpe-gaim/src/QGaimBListWindow.h 2005-02-28 23:21:30.000000000 +0100
202 #ifndef _QGAIM_BLIST_WIN_H_
203 #define _QGAIM_BLIST_WIN_H_
205 -#include <libgaim/blist.h>
206 +#include <gaim/blist.h>
208 #include <qiconset.h>
209 #include <qmainwindow.h>
210 diff -ur qpe-gaim.old/src/QGaimBuddyList.cpp qpe-gaim/src/QGaimBuddyList.cpp
211 --- qpe-gaim.old/src/QGaimBuddyList.cpp 2004-10-30 20:08:06.000000000 +0200
212 +++ qpe-gaim/src/QGaimBuddyList.cpp 2005-02-28 23:24:27.000000000 +0100
214 #include "QGaimProtocolUtils.h"
215 #include "QGaimImageUtils.h"
217 -#include <libgaim/debug.h>
218 -#include <libgaim/multi.h>
219 -#include <libgaim/prefs.h>
220 -#include <libgaim/request.h>
221 -#include <libgaim/server.h>
222 +#include <gaim/debug.h>
223 +#include <gaim/prefs.h>
224 +#include <gaim/request.h>
225 +#include <gaim/server.h>
227 #include <qpe/qpeapplication.h>
228 #include <qpe/resource.h>
233 - setText(0, gaim_get_buddy_alias(buddy));
234 + setText(0, gaim_buddy_get_alias(buddy));
236 else if (GAIM_BLIST_NODE_IS_BUDDY(node))
241 setPixmap(0, QGaimBuddyList::getBuddyStatusIcon(node, pixmapSize));
242 - setText(0, gaim_get_buddy_alias(buddy));
243 + setText(0, gaim_buddy_get_alias(buddy));
246 else if (GAIM_BLIST_NODE_IS_CHAT(node))
248 if (contact != NULL && !isExpanded() && contact->alias != NULL)
249 topText = contact->alias;
251 - topText = gaim_get_buddy_alias(buddy);
252 + topText = gaim_buddy_get_alias(buddy);
254 bottomText = statusText + idleTime + warning;
256 diff -ur qpe-gaim.old/src/QGaimBuddyList.h qpe-gaim/src/QGaimBuddyList.h
257 --- qpe-gaim.old/src/QGaimBuddyList.h 2004-10-30 20:08:06.000000000 +0200
258 +++ qpe-gaim/src/QGaimBuddyList.h 2005-02-28 23:21:30.000000000 +0100
260 #ifndef _QGAIM_BUDDY_LIST_H_
261 #define _QGAIM_BUDDY_LIST_H_
263 -#include <libgaim/account.h>
264 -#include <libgaim/blist.h>
265 +#include <gaim/account.h>
266 +#include <gaim/blist.h>
268 #include <qlistview.h>
270 diff -ur qpe-gaim.old/src/QGaimConnectionMeter.cpp qpe-gaim/src/QGaimConnectionMeter.cpp
271 --- qpe-gaim.old/src/QGaimConnectionMeter.cpp 2004-10-30 20:08:06.000000000 +0200
272 +++ qpe-gaim/src/QGaimConnectionMeter.cpp 2005-02-28 23:21:30.000000000 +0100
274 #include "QGaimConnectionMeter.h"
275 #include "QGaimProtocolUtils.h"
277 -#include <libgaim/debug.h>
278 +#include <gaim/debug.h>
280 #include <qpushbutton.h>
282 diff -ur qpe-gaim.old/src/QGaimConnectionMeter.h qpe-gaim/src/QGaimConnectionMeter.h
283 --- qpe-gaim.old/src/QGaimConnectionMeter.h 2004-10-30 20:08:06.000000000 +0200
284 +++ qpe-gaim/src/QGaimConnectionMeter.h 2005-02-28 23:21:30.000000000 +0100
286 #include <qvariant.h>
289 -#include <libgaim/connection.h>
290 +#include <gaim/connection.h>
294 diff -ur qpe-gaim.old/src/QGaimConvButton.cpp qpe-gaim/src/QGaimConvButton.cpp
295 --- qpe-gaim.old/src/QGaimConvButton.cpp 2004-10-30 20:08:06.000000000 +0200
296 +++ qpe-gaim/src/QGaimConvButton.cpp 2005-02-28 23:21:30.000000000 +0100
298 #include "QGaimMainWindow.h"
301 -#include <libgaim/debug.h>
302 -#include <libgaim/signals.h>
303 +#include <gaim/debug.h>
304 +#include <gaim/signals.h>
306 #include <qpe/resource.h>
307 #include <qpopupmenu.h>
308 diff -ur qpe-gaim.old/src/QGaimConvButton.h qpe-gaim/src/QGaimConvButton.h
309 --- qpe-gaim.old/src/QGaimConvButton.h 2004-10-30 20:08:06.000000000 +0200
310 +++ qpe-gaim/src/QGaimConvButton.h 2005-02-28 23:21:30.000000000 +0100
313 #include <qtoolbutton.h>
315 -#include <libgaim/conversation.h>
316 +#include <gaim/conversation.h>
320 diff -ur qpe-gaim.old/src/QGaimConvWindow.cpp qpe-gaim/src/QGaimConvWindow.cpp
321 --- qpe-gaim.old/src/QGaimConvWindow.cpp 2004-10-30 20:08:06.000000000 +0200
322 +++ qpe-gaim/src/QGaimConvWindow.cpp 2005-02-28 23:34:33.000000000 +0100
324 #include "QGaimMainWindow.h"
327 -#include <libgaim/debug.h>
328 -#include <libgaim/prefs.h>
329 +#include <gaim/debug.h>
330 +#include <gaim/prefs.h>
332 #include <qpe/resource.h>
333 #include <qpe/qpeapplication.h>
334 @@ -1260,7 +1260,7 @@
338 -qGaimConvChatAddUser(GaimConversation *conv, const char *user)
339 +qGaimConvChatAddUser(GaimConversation *conv, const char *user, gboolean)
341 QGaimConvChat *qchat = (QGaimConvChat *)conv->ui_data;
343 @@ -1321,6 +1321,7 @@
344 qGaimConvChatRemoveUsers,
351 diff -ur qpe-gaim.old/src/QGaimConvWindow.h qpe-gaim/src/QGaimConvWindow.h
352 --- qpe-gaim.old/src/QGaimConvWindow.h 2004-10-30 20:08:06.000000000 +0200
353 +++ qpe-gaim/src/QGaimConvWindow.h 2005-02-28 23:21:30.000000000 +0100
356 #include <qmainwindow.h>
358 -#include <libgaim/conversation.h>
359 +#include <gaim/conversation.h>
362 class QGaimMultiLineEdit;
363 diff -ur qpe-gaim.old/src/QGaimDebugWindow.cpp qpe-gaim/src/QGaimDebugWindow.cpp
364 --- qpe-gaim.old/src/QGaimDebugWindow.cpp 2004-10-30 20:08:06.000000000 +0200
365 +++ qpe-gaim/src/QGaimDebugWindow.cpp 2005-02-28 23:21:30.000000000 +0100
368 #include "QGaimDebugWindow.h"
370 -#include <libgaim/debug.h>
371 +#include <gaim/debug.h>
375 diff -ur qpe-gaim.old/src/QGaimDebugWindow.h qpe-gaim/src/QGaimDebugWindow.h
376 --- qpe-gaim.old/src/QGaimDebugWindow.h 2004-10-30 20:08:06.000000000 +0200
377 +++ qpe-gaim/src/QGaimDebugWindow.h 2005-02-28 23:21:30.000000000 +0100
379 #ifndef _QGAIM_DEBUG_WIN_H_
380 #define _QGAIM_DEBUG_WIN_H_
382 -#include <libgaim/debug.h>
383 +#include <gaim/debug.h>
385 GaimDebugUiOps *qGaimGetDebugUiOps(void);
387 diff -ur qpe-gaim.old/src/QGaimDialogs.cpp qpe-gaim/src/QGaimDialogs.cpp
388 --- qpe-gaim.old/src/QGaimDialogs.cpp 2004-10-30 20:08:06.000000000 +0200
389 +++ qpe-gaim/src/QGaimDialogs.cpp 2005-02-28 23:38:32.000000000 +0100
391 #include "QGaimDialogs.h"
392 #include "QGaimAccountBox.h"
394 -#include <libgaim/blist.h>
395 -#include <libgaim/conversation.h>
396 -#include <libgaim/multi.h>
397 -#include <libgaim/notify.h>
398 -#include <libgaim/prpl.h>
399 +#include <gaim/blist.h>
400 +#include <gaim/conversation.h>
401 +#include <gaim/notify.h>
402 +#include <gaim/prpl.h>
404 #include <qcombobox.h>
410 - QLineEdit *edit = new QLineEdit(pce->def, widgetsFrame);
411 + QLineEdit *edit = new QLineEdit(pce->identifier, widgetsFrame);
413 grid->addWidget(edit, row, 1);
419 - QLineEdit *edit = new QLineEdit(pce->def, widgetsFrame);
420 + QLineEdit *edit = new QLineEdit(pce->identifier, widgetsFrame);
422 grid->addWidget(edit, row, 1);
424 diff -ur qpe-gaim.old/src/QGaimDialogs.h qpe-gaim/src/QGaimDialogs.h
425 --- qpe-gaim.old/src/QGaimDialogs.h 2004-10-30 20:08:06.000000000 +0200
426 +++ qpe-gaim/src/QGaimDialogs.h 2005-02-28 23:21:30.000000000 +0100
428 #ifndef _QGAIM_DIALOGS_H_
429 #define _QGAIM_DIALOGS_H_
431 -#include <libgaim/account.h>
432 +#include <gaim/account.h>
436 diff -ur qpe-gaim.old/src/QGaimEventLoop.cpp qpe-gaim/src/QGaimEventLoop.cpp
437 --- qpe-gaim.old/src/QGaimEventLoop.cpp 2004-10-30 20:08:06.000000000 +0200
438 +++ qpe-gaim/src/QGaimEventLoop.cpp 2005-03-03 22:59:49.000000000 +0100
440 static guint nextSourceId = 0;
441 static QIntDict<QGaimSourceInfo> sources;
443 -QGaimTimer::QGaimTimer(guint sourceId, GSourceFunc func, gpointer data)
444 - : QTimer(), sourceId(sourceId), func(func), userData(data)
445 +QGaimTimer::QGaimTimer(guint _sourceId, GSourceFunc func, gpointer data)
446 + : QTimer(), sourceId(_sourceId), func(func), userData(data)
448 connect(this, SIGNAL(timeout()),
449 this, SLOT(update()));
450 Nur in qpe-gaim/src: QGaimEventLoop.cpp~.
451 diff -ur qpe-gaim.old/src/QGaimEventLoop.h qpe-gaim/src/QGaimEventLoop.h
452 --- qpe-gaim.old/src/QGaimEventLoop.h 2004-10-30 20:08:06.000000000 +0200
453 +++ qpe-gaim/src/QGaimEventLoop.h 2005-02-28 23:21:30.000000000 +0100
455 #ifndef _QGAIM_EVENT_LOOP_H_
456 #define _QGAIM_EVENT_LOOP_H_
458 -#include <libgaim/eventloop.h>
459 +#include <gaim/eventloop.h>
462 #include <qsocketnotifier.h>
463 diff -ur qpe-gaim.old/src/QGaimImageUtils.cpp qpe-gaim/src/QGaimImageUtils.cpp
464 --- qpe-gaim.old/src/QGaimImageUtils.cpp 2004-10-30 20:08:06.000000000 +0200
465 +++ qpe-gaim/src/QGaimImageUtils.cpp 2005-02-28 23:21:30.000000000 +0100
468 #include "QGaimImageUtils.h"
470 -#include <libgaim/debug.h>
471 +#include <gaim/debug.h>
475 diff -ur qpe-gaim.old/src/QGaimMainWindow.cpp qpe-gaim/src/QGaimMainWindow.cpp
476 --- qpe-gaim.old/src/QGaimMainWindow.cpp 2004-10-30 20:08:06.000000000 +0200
477 +++ qpe-gaim/src/QGaimMainWindow.cpp 2005-03-01 00:31:54.000000000 +0100
480 #include <qpe/qpeapplication.h>
482 -#include <libgaim/prefs.h>
483 -#include <libgaim/conversation.h>
484 -#include <libgaim/core.h>
485 -#include <libgaim/proxy.h>
486 -#include <libgaim/sound.h>
487 -#include <libgaim/pounce.h>
488 -#include <libgaim/plugin.h>
489 +#include <gaim/prefs.h>
490 +#include <gaim/conversation.h>
491 +#include <gaim/core.h>
492 +#include <gaim/proxy.h>
493 +#include <gaim/sound.h>
494 +#include <gaim/pounce.h>
495 +#include <gaim/plugin.h>
497 #include "QGaimConnectionMeter.h"
498 #include "QGaimConvWindow.h"
501 QGaimMainWindow::initCore()
503 - char *plugin_search_paths[1];
504 + char *plugin_search_paths[2];
506 gaim_core_set_ui_ops(qGaimGetCoreUiOps());
507 gaim_eventloop_set_ui_ops(qGaimGetEventLoopUiOps());
509 "Please report this!\n"));
512 -#ifdef LOCAL_COMPILE
513 plugin_search_paths[0] = "/opt/Qtopia/lib/gaim";
515 - plugin_search_paths[0] = "/usr/lib/gaim";
517 + plugin_search_paths[1] = "/usr/lib/gaim";
519 gaim_plugins_set_search_paths(sizeof(plugin_search_paths) /
520 sizeof(*plugin_search_paths),
521 diff -ur qpe-gaim.old/src/QGaimMainWindow.h qpe-gaim/src/QGaimMainWindow.h
522 --- qpe-gaim.old/src/QGaimMainWindow.h 2004-10-30 20:08:06.000000000 +0200
523 +++ qpe-gaim/src/QGaimMainWindow.h 2005-02-28 23:21:30.000000000 +0100
525 #include <qmainwindow.h>
526 #include <qwidgetstack.h>
528 -#include <libgaim/conversation.h>
529 +#include <gaim/conversation.h>
531 #include "QGaimBListWindow.h"
533 diff -ur qpe-gaim.old/src/QGaimNotify.cpp qpe-gaim/src/QGaimNotify.cpp
534 --- qpe-gaim.old/src/QGaimNotify.cpp 2004-10-30 20:08:06.000000000 +0200
535 +++ qpe-gaim/src/QGaimNotify.cpp 2005-02-28 23:42:01.000000000 +0100
538 #include "QGaimNotify.h"
540 -#include <libgaim/prefs.h>
541 +#include <gaim/prefs.h>
546 #include <qmessagebox.h>
547 #include <qtextview.h>
549 -#include <opie/odevice.h>
550 +#include <opie2/odevice.h>
552 -using namespace Opie;
553 +using namespace Opie::Core;
555 static int notifyActiveCount = 0;
558 if (!gaim_prefs_get_bool("/gaim/qpe/notify/use_buzzer"))
561 - ODevice::inst()->alarmSound();
562 + ODevice::inst()->playAlarmSound();
566 Nur in qpe-gaim/src: QGaimNotify.cpp.rej.
567 diff -ur qpe-gaim.old/src/QGaimNotify.h qpe-gaim/src/QGaimNotify.h
568 --- qpe-gaim.old/src/QGaimNotify.h 2004-10-30 20:08:06.000000000 +0200
569 +++ qpe-gaim/src/QGaimNotify.h 2005-02-28 23:21:30.000000000 +0100
571 #ifndef _QGAIM_NOTIFY_H_
572 #define _QGAIM_NOTIFY_H_
574 -#include <libgaim/notify.h>
575 +#include <gaim/notify.h>
577 GaimNotifyUiOps *qGaimGetNotifyUiOps();
579 diff -ur qpe-gaim.old/src/QGaimPrefsDialog.cpp qpe-gaim/src/QGaimPrefsDialog.cpp
580 --- qpe-gaim.old/src/QGaimPrefsDialog.cpp 2004-10-30 20:08:06.000000000 +0200
581 +++ qpe-gaim/src/QGaimPrefsDialog.cpp 2005-02-28 23:42:01.000000000 +0100
583 #include "QGaimPrefsDialog.h"
584 #include "QGaimMainWindow.h"
586 -#include <libgaim/debug.h>
587 -#include <libgaim/prefs.h>
588 +#include <gaim/debug.h>
589 +#include <gaim/prefs.h>
591 #include <qcheckbox.h>
595 #include <qvgroupbox.h>
597 -#include <opie/otabwidget.h>
598 -#include <opie/owait.h>
599 +#include <opie2/otabwidget.h>
600 +#include <opie2/owait.h>
602 #include <qpe/resource.h>
605 layout = new QVBoxLayout(this);
606 layout->setAutoAdd(true);
608 - tabs = new OTabWidget(this, "pref tabs");
609 + tabs = new Opie::Ui::OTabWidget(this, "pref tabs");
611 blistPage = new QGaimBlistPrefPage(this, "blist page");
612 notifyPage = new QGaimNotifyPrefPage(this, "notify page");
615 QGaimPrefsDialog::accept()
618 + Opie::Ui::OWait wait(this);
622 diff -ur qpe-gaim.old/src/QGaimPrefsDialog.h qpe-gaim/src/QGaimPrefsDialog.h
623 --- qpe-gaim.old/src/QGaimPrefsDialog.h 2004-10-30 20:08:06.000000000 +0200
624 +++ qpe-gaim/src/QGaimPrefsDialog.h 2005-02-28 23:42:01.000000000 +0100
626 #define _QGAIM_PREFS_DIALOG_H_
629 +#include <opie2/otabwidget.h>
634 class QGaimPrefPage : public QWidget
636 void buildInterface();
640 + Opie::Ui::OTabWidget *tabs;
642 QGaimPrefPage *blistPage;
643 QGaimPrefPage *convPage;
644 diff -ur qpe-gaim.old/src/QGaimProtocolBox.cpp qpe-gaim/src/QGaimProtocolBox.cpp
645 --- qpe-gaim.old/src/QGaimProtocolBox.cpp 2004-10-30 20:08:06.000000000 +0200
646 +++ qpe-gaim/src/QGaimProtocolBox.cpp 2005-02-28 23:21:30.000000000 +0100
648 #include "QGaimProtocolBox.h"
649 #include "QGaimProtocolUtils.h"
651 -#include <libgaim/debug.h>
652 +#include <gaim/debug.h>
656 diff -ur qpe-gaim.old/src/QGaimProtocolBox.h qpe-gaim/src/QGaimProtocolBox.h
657 --- qpe-gaim.old/src/QGaimProtocolBox.h 2004-10-30 20:08:06.000000000 +0200
658 +++ qpe-gaim/src/QGaimProtocolBox.h 2005-02-28 23:21:30.000000000 +0100
660 #include <qvariant.h>
661 #include <qcombobox.h>
663 -#include <libgaim/prpl.h>
664 +#include <gaim/prpl.h>
666 class QGaimProtocolBox : public QComboBox
668 diff -ur qpe-gaim.old/src/QGaimProtocolUtils.h qpe-gaim/src/QGaimProtocolUtils.h
669 --- qpe-gaim.old/src/QGaimProtocolUtils.h 2004-10-30 20:08:06.000000000 +0200
670 +++ qpe-gaim/src/QGaimProtocolUtils.h 2005-02-28 23:21:30.000000000 +0100
673 #include <qvariant.h>
675 -#include <libgaim/account.h>
676 -#include <libgaim/plugin.h>
677 -#include <libgaim/prpl.h>
678 +#include <gaim/account.h>
679 +#include <gaim/plugin.h>
680 +#include <gaim/prpl.h>
682 #include "QGaimImageUtils.h"
684 diff -ur qpe-gaim.old/src/QGaimRequest.cpp qpe-gaim/src/QGaimRequest.cpp
685 --- qpe-gaim.old/src/QGaimRequest.cpp 2004-10-30 20:08:06.000000000 +0200
686 +++ qpe-gaim/src/QGaimRequest.cpp 2005-02-28 23:21:30.000000000 +0100
688 #include "QGaimInputDialog.h"
689 #include "QGaimMainWindow.h"
691 -#include <libgaim/debug.h>
692 +#include <gaim/debug.h>
694 #include <qmessagebox.h>
696 diff -ur qpe-gaim.old/src/QGaimRequest.h qpe-gaim/src/QGaimRequest.h
697 --- qpe-gaim.old/src/QGaimRequest.h 2004-10-30 20:08:06.000000000 +0200
698 +++ qpe-gaim/src/QGaimRequest.h 2005-02-28 23:21:30.000000000 +0100
700 #ifndef _QGAIM_REQUEST_H_
701 #define _QGAIM_REQUEST_H_
703 -#include <libgaim/request.h>
704 +#include <gaim/request.h>
706 GaimRequestUiOps *qGaimGetRequestUiOps();
708 diff -ur qpe-gaim.old/src/QGaimTabBar.cpp qpe-gaim/src/QGaimTabBar.cpp
709 --- qpe-gaim.old/src/QGaimTabBar.cpp 2004-10-30 20:08:06.000000000 +0200
710 +++ qpe-gaim/src/QGaimTabBar.cpp 2005-02-28 23:21:30.000000000 +0100
713 #include "QGaimTabBar.h"
715 -#include <libgaim/debug.h>
716 +#include <gaim/debug.h>
718 /**************************************************************************
720 Nur in qpe-gaim/src: semantic.cache.
721 Nur in qpe-gaim/src: semantic.cache~.