org.handhelds.familiar/packages/qpe-gaim/files/libgaim.patch

   1 Index: gaim-1.3.0/src/status.c
   2 ===================================================================
   3 --- gaim-1.3.0.orig/src/status.c        2005-02-10 01:07:25.000000000 +0100
   4 +++ gaim-1.3.0/src/status.c     2005-06-05 02:21:59.000000000 +0200
   5 @@ -24,10 +24,13 @@
   6  #include "internal.h"
   7  #include "debug.h"
   8  #include "util.h"
   9 +#include "away.h"
  10
  11  /* XXX CORE/UI */
  12 +#if 0
  13  #include "away.h"
  14  #include "gtkgaim.h"
  15 +#endif
  16
  17
  18  /* for people like myself who are too lazy to add an away msg :) */
  19 Index: gaim-1.3.0/plugins/Makefile.am
  20 ===================================================================
  21 --- gaim-1.3.0.orig/plugins/Makefile.am 2005-04-29 19:01:57.000000000 +0200
  22 +++ gaim-1.3.0/plugins/Makefile.am      2005-06-05 02:24:20.000000000 +0200
  23 @@ -13,46 +13,29 @@
  24  endif
  25
  26  SUBDIRS = \
  27 -       docklet gaim-remote $(GEVOLUTION_DIR) gestures \
  28 -       $(PERL_DIR) $(TCL_DIR) ssl ticker
  29 +       $(GEVOLUTION_DIR) \
  30 +       $(PERL_DIR) $(TCL_DIR) ssl
  31
  32  plugindir = $(libdir)/gaim
  33
  34  autorecon_la_LDFLAGS    = -module -avoid-version $(GLIB_LIBS)
  35  extplacement_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
  36 -history_la_LDFLAGS      = -module -avoid-version $(GTK_LIBS)
  37 -iconaway_la_LDFLAGS     = -module -avoid-version $(GTK_LIBS)
  38  idle_la_LDFLAGS         = -module -avoid-version $(GLIB_LIBS)
  39 -notify_la_LDFLAGS       = -module -avoid-version $(GTK_LIBS)
  40  relnot_la_LDFLAGS       = -module -avoid-version $(GLIB_LIBS)
  41 -spellchk_la_LDFLAGS     = -module -avoid-version $(GTK_LIBS)
  42  statenotify_la_LDFLAGS  = -module -avoid-version $(GLIB_LIBS)
  43 -timestamp_la_LDFLAGS    = -module -avoid-version $(GTK_LIBS)
  44
  45  if PLUGINS
  46
  47  plugin_LTLIBRARIES = \
  48         autorecon.la     \
  49 -       extplacement.la  \
  50 -       history.la       \
  51 -       iconaway.la      \
  52         idle.la          \
  53 -       notify.la        \
  54         relnot.la        \
  55 -       spellchk.la      \
  56 -       statenotify.la   \
  57 -       timestamp.la
  58 +       statenotify.la
  59
  60  autorecon_la_SOURCES    = autorecon.c
  61 -extplacement_la_SOURCES = extplacement.c
  62 -history_la_SOURCES      = history.c
  63 -iconaway_la_SOURCES     = iconaway.c
  64  idle_la_SOURCES         = idle.c
  65 -notify_la_SOURCES       = notify.c
  66  relnot_la_SOURCES       = relnot.c
  67 -spellchk_la_SOURCES     = spellchk.c
  68  statenotify_la_SOURCES  = statenotify.c
  69 -timestamp_la_SOURCES    = timestamp.c
  70
  71  endif # PLUGINS
  72
  73 @@ -74,7 +57,7 @@
  74         -DVERSION=\"$(VERSION)\" \
  75         -I$(top_srcdir)/src \
  76         $(DEBUG_CFLAGS) \
  77 -       $(GTK_CFLAGS) \
  78 +       $(GLIB_CFLAGS) \
  79         $(PLUGIN_CFLAGS)
  80
  81  #
  82 Index: gaim-1.3.0/src/gaim.h
  83 ===================================================================
  84 --- gaim-1.3.0.orig/src/gaim.h  2004-08-08 07:37:58.000000000 +0200
  85 +++ gaim-1.3.0/src/gaim.h       2005-06-05 02:21:59.000000000 +0200
  86 @@ -27,6 +27,10 @@
  87
  88  #include "connection.h"
  89
  90 +#ifdef __cplusplus
  91 +extern "C" {
  92 +#endif
  93 +
  94  /* Globals in main.c */
  95  extern int opt_away;
  96  extern char *opt_away_arg;
  97 @@ -36,7 +40,28 @@
  98  extern GSList *unread_message_queue;
  99  extern GSList *away_time_queue;
 100
 101 +
 102 +/* copied from gtkdialog.h */
 103 +struct queued_message {
 104 +        char name[80];
 105 +        char alias[80];
 106 +        char *message;
 107 +        time_t tm;
 108 +        GaimAccount *account;
 109 +        GaimMessageFlags flags;
 110 +};
 111 +
 112  /* Functions in idle.c */
 113  extern gint check_idle(gpointer);
 114
 115 +/* Variable in .. */
 116 +extern int docklet_count;
 117 +
 118 +/* implemented by gtkutils.h and used by server.c */
 119 +extern char *stylize(const gchar *text, int length);
 120 +
 121 +#ifdef __cplusplus
 122 +}
 123 +#endif
 124 +
 125  #endif /* _GAIM_H_ */
 126 Index: gaim-1.3.0/src/Makefile.am
 127 ===================================================================
 128 --- gaim-1.3.0.orig/src/Makefile.am     2005-04-11 22:59:21.000000000 +0200
 129 +++ gaim-1.3.0/src/Makefile.am  2005-06-05 02:21:59.000000000 +0200
 130 @@ -61,6 +61,8 @@
 131
 132  SUBDIRS = protocols
 133
 134 +lib_LTLIBRARIES = libgaim.la
 135 +
 136  gaim_coresources = \
 137         account.c \
 138         accountopt.c \
 139 @@ -112,6 +114,7 @@
 140         debug.h \
 141         eventloop.h \
 142         ft.h \
 143 +       gaim.h \
 144         imgstore.h \
 145         log.h \
 146         md5.h \
 147 @@ -139,101 +142,21 @@
 148         version.h \
 149         xmlnode.h
 150
 151 -bin_PROGRAMS = gaim gaim-remote
 152 -
 153 -gaim_SOURCES = \
 154 -       $(gaim_coresources) \
 155 -       away.c \
 156 -       dnd-hints.c \
 157 -       gaim-disclosure.c \
 158 -       gtkaccount.c \
 159 -       gtkcellrendererprogress.c \
 160 -       gtkblist.c \
 161 -       gtkconn.c \
 162 -       gtkconv.c \
 163 -       gtkdebug.c \
 164 -       gtkdialogs.c \
 165 -       gtkeventloop.c \
 166 -       gtkft.c \
 167 -       gtkimhtml.c \
 168 -       gtkimhtmltoolbar.c \
 169 -       gtklog.c \
 170 -       gtknotify.c \
 171 -       gtkplugin.c \
 172 -       gtkpluginpref.c \
 173 -       gtkprefs.c \
 174 -       gtkprivacy.c \
 175 -       gtkpounce.c \
 176 -       gtkrequest.c \
 177 -       gtkroomlist.c \
 178 -       gtksound.c \
 179 -       gtksourceiter.c \
 180 -       gtkutils.c \
 181 -       idle.c \
 182 -       main.c \
 183 -       session.c \
 184 -       stock.c \
 185 -       themes.c
 186 -
 187 -gaim_headers = \
 188 -       $(gaim_coreheaders) \
 189 -       dnd-hints.h \
 190 -       gaim.h \
 191 -       gaim-disclosure.h \
 192 -       gtkaccount.h \
 193 -       gtkcellrendererprogress.h \
 194 -       gtkblist.h \
 195 -       gtkconn.h \
 196 -       gtkconv.h \
 197 -       gtkdebug.h \
 198 -       gtkdialogs.h \
 199 -       gtkeventloop.h \
 200 -       gtkft.h \
 201 -       gtkgaim.h \
 202 -       gtkimhtml.h \
 203 -       gtkimhtmltoolbar.h \
 204 -       gtklog.h \
 205 -       gtknotify.h \
 206 -       gtkplugin.h \
 207 -       gtkpluginpref.h \
 208 -       gtkprefs.h \
 209 -       gtkprivacy.h \
 210 -       gtkpounce.h \
 211 -       gtkrequest.h \
 212 -       gtkroomlist.h \
 213 -       gtksound.h \
 214 -       gtksourceiter.h \
 215 -       gtkutils.h \
 216 -       internal.h \
 217 -       stock.h
 218
 219  gaimincludedir=$(includedir)/gaim
 220  gaiminclude_HEADERS = \
 221 -       $(gaim_coreheaders) \
 222 -       $(gaim_headers)
 223 +       $(gaim_coreheaders)
 224
 225 -gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
 226 -gaim_LDFLAGS = -export-dynamic
 227 -gaim_LDADD = \
 228 -       @LIBOBJS@ \
 229 -       $(GTK_LIBS) \
 230 -       $(SOUND_LIBS) \
 231 -       $(STATIC_LINK_LIBS) \
 232 -       $(XSS_LIBS) \
 233 -       $(SM_LIBS) \
 234 -       $(INTLLIBS) \
 235 -       $(GTKSPELL_LIBS) \
 236 -       $(STARTUP_NOTIFICATION_LIBS)
 237 -
 238 -gaim_remote_SOURCES = \
 239 -       gaim-remote.c \
 240 -       prefix.c \
 241 -       prefix.h
 242 +libgaim_la_SOURCES = \
 243 +       $(gaim_coresources)
 244
 245 -gaim_remote_DEPENDENCIES = @LIBOBJS@
 246 -gaim_remote_LDADD = \
 247 -       @LIBOBJS@ $(GLIB_LIBS) $(INTLLIBS) \
 248 -       $(top_builddir)/plugins/gaim-remote/libgaim-remote.la
 249 +libgaim_la_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
 250 +libgaim_la_LDFLAGS = -version-info 0:0:0
 251 +libgaim_la_LIBDADD = \
 252 +       @LIBOBJS@
 253 +       $(GLIB_LIBS) \
 254 +       $(STATIC_LINK_LIBS) \
 255 +       $(INTLLIBS)
 256
 257  AM_CPPFLAGS = \
 258         -DBR_PTHREADS=0 \
 259 @@ -242,9 +165,5 @@
 260         -DLOCALEDIR=\"$(datadir)/locale\" \
 261         -DSYSCONFDIR=\"$(sysconfdir)\" \
 262         -I$(top_srcdir)/plugins \
 263 -       $(AUDIOFILE_CFLAGS) \
 264 -       $(AO_CFLAGS) \
 265         $(DEBUG_CFLAGS) \
 266 -       $(GTK_CFLAGS) \
 267 -       $(GTKSPELL_CFLAGS) \
 268 -       $(STARTUP_NOTIFICATION_CFLAGS)
 269 +       $(GLIB_CFLAGS)
 270 Index: gaim-1.3.0/plugins/extplacement.c
 271 ===================================================================
 272 --- gaim-1.3.0.orig/plugins/extplacement.c      2004-09-03 23:34:03.000000000 +0200
 273 +++ gaim-1.3.0/plugins/extplacement.c   2005-06-05 02:21:59.000000000 +0200
 274 @@ -21,10 +21,12 @@
 275   */
 276
 277  #include "internal.h"
 278 +#if 0
 279  #include "gtkgaim.h"
 280 +#include "gtkplugin.h"
 281 +#endif
 282  #include "conversation.h"
 283  #include "version.h"
 284 -#include "gtkplugin.h"
 285
 286  static void
 287  conv_placement_by_number(GaimConversation *conv)
 288 Index: gaim-1.3.0/src/away.h
 289 ===================================================================
 290 --- gaim-1.3.0.orig/src/away.h  2004-08-20 07:11:29.000000000 +0200
 291 +++ gaim-1.3.0/src/away.h       2005-06-05 02:21:59.000000000 +0200
 292 @@ -25,7 +25,7 @@
 293  #ifndef _GAIM_AWAY_H_
 294  #define _GAIM_AWAY_H_
 295
 296 -#include "gtkgaim.h"
 297 +#include "gaim.h"
 298
 299  /* XXX CUI: away messages aren't really anything more than char* but we need two char*'s
 300   * for the UI so that people can name their away messages when they save them. So these
 301 @@ -36,6 +36,23 @@
 302         char message[2048];
 303  };
 304
 305 +
 306 +
 307 +extern GSList *away_messages;
 308 +extern struct away_message *awaymessage;
 309 +extern void *awaymenu;
 310 +extern void *awayqueue;
 311 +extern void *awayqueuestore;
 312 +
 313 +extern void rem_away_mess(void *, struct away_message *);
 314 +extern void do_away_message(void *, struct away_message *);
 315 +extern void do_away_menu();
 316 +extern void toggle_away_queue();
 317 +extern void purge_away_queue(GSList **);
 318 +extern void do_im_back(void *, void*);
 319 +void create_away_mess(void *, void *);
 320 +
 321 +#if 0
 322  extern GSList *away_messages;
 323  extern struct away_message *awaymessage;
 324  extern GtkWidget *awaymenu;
 325 @@ -49,5 +66,6 @@
 326  extern void purge_away_queue(GSList **);
 327  extern void do_im_back(GtkWidget *, GtkWidget *);
 328  void create_away_mess(GtkWidget *, void *);
 329 +#endif
 330
 331  #endif /* _GAIM_AWAY_H_ */
 332 Index: gaim-1.3.0/src/server.c
 333 ===================================================================
 334 --- gaim-1.3.0.orig/src/server.c        2005-04-14 21:17:50.000000000 +0200
 335 +++ gaim-1.3.0/src/server.c     2005-06-05 02:21:59.000000000 +0200
 336 @@ -32,13 +32,17 @@
 337  #include "server.h"
 338  #include "sound.h"
 339  #include "util.h"
 340 +#include "gaim.h"
 341 +#include "away.h"
 342
 343 +#if 0
 344  /* XXX UI Stuff */
 345  #include "away.h"
 346  #include "gtkdialogs.h"
 347  #include "gaim.h"
 348  #include "gtkimhtml.h"
 349  #include "gtkutils.h"
 350 +#endif
 351
 352  #define SECS_BEFORE_RESENDING_AUTORESPONSE 600
 353  #define SEX_BEFORE_RESENDING_AUTORESPONSE "Only after you're married"
 354 @@ -805,6 +809,8 @@
 355         gchar *temp;
 356         gint i = 0;
 357         gboolean valid;
 358 +
 359 +#if 0
 360         GtkTreeIter iter;
 361
 362         valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(awayqueuestore), &iter);
 363 @@ -817,6 +823,7 @@
 364                 i++;
 365                 valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(awayqueuestore), &iter);
 366         }
 367 +#endif
 368
 369         return -1;
 370  }
 371 @@ -828,7 +835,7 @@
 372
 373         templist = message_queue;
 374
 375 -       while (templist) {
 376 +       while (templist) {
 377                 struct queued_message *qm = (struct queued_message *)templist->data;
 378                 if ((qm->flags & GAIM_MESSAGE_RECV) && !strcmp(name, qm->name))
 379                         i++;
 380 @@ -964,6 +971,7 @@
 381                         qm->flags = msgflags;
 382
 383                         if (queue_to_away) {
 384 +#if 0
 385                                 GtkTreeIter iter;
 386                                 gchar path[10];
 387
 388 @@ -992,6 +1000,7 @@
 389                                                                         2, _("(1 message)"),
 390                                                                         -1);
 391                                 }
 392 +#endif
 393                         } else /* queue_to_docklet */
 394                                 unread_message_queue = g_slist_append(unread_message_queue, qm);
 395                 } else {
 396 @@ -1049,7 +1058,12 @@
 397                 lar->sent = t;
 398
 399                 /* apply default fonts and colors */
 400 +               #if 0
 401                 tmpmsg = stylize(gc->away, MSG_LEN);
 402 +               #else
 403 +               tmpmsg = (gchar*)g_malloc(MSG_LEN);
 404 +               g_snprintf(tmpmsg, MSG_LEN, "%s", gc->away);
 405 +               #endif
 406
 407                 /* Move this to oscar.c! */
 408                 buffy = gaim_str_sub_away_formatters(tmpmsg, alias);