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
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
27 - docklet gaim-remote $(GEVOLUTION_DIR) gestures \
28 - $(PERL_DIR) $(TCL_DIR) ssl ticker
30 + $(PERL_DIR) $(TCL_DIR) ssl
32 plugindir = $(libdir)/gaim
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)
47 plugin_LTLIBRARIES = \
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
74 -DVERSION=\"$(VERSION)\" \
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
88 #include "connection.h"
94 /* Globals in main.c */
96 extern char *opt_away_arg;
98 extern GSList *unread_message_queue;
99 extern GSList *away_time_queue;
102 +/* copied from gtkdialog.h */
103 +struct queued_message {
108 + GaimAccount *account;
109 + GaimMessageFlags flags;
112 /* Functions in idle.c */
113 extern gint check_idle(gpointer);
115 +/* Variable in .. */
116 +extern int docklet_count;
118 +/* implemented by gtkutils.h and used by server.c */
119 +extern char *stylize(const gchar *text, int length);
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
134 +lib_LTLIBRARIES = libgaim.la
147 @@ -139,101 +142,21 @@
151 -bin_PROGRAMS = gaim gaim-remote
154 - $(gaim_coresources) \
157 - gaim-disclosure.c \
159 - gtkcellrendererprogress.c \
168 - gtkimhtmltoolbar.c \
188 - $(gaim_coreheaders) \
191 - gaim-disclosure.h \
193 - gtkcellrendererprogress.h \
203 - gtkimhtmltoolbar.h \
219 gaimincludedir=$(includedir)/gaim
220 gaiminclude_HEADERS = \
221 - $(gaim_coreheaders) \
223 + $(gaim_coreheaders)
225 -gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
226 -gaim_LDFLAGS = -export-dynamic
231 - $(STATIC_LINK_LIBS) \
236 - $(STARTUP_NOTIFICATION_LIBS)
238 -gaim_remote_SOURCES = \
242 +libgaim_la_SOURCES = \
243 + $(gaim_coresources)
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 = \
254 + $(STATIC_LINK_LIBS) \
260 -DLOCALEDIR=\"$(datadir)/locale\" \
261 -DSYSCONFDIR=\"$(sysconfdir)\" \
262 -I$(top_srcdir)/plugins \
263 - $(AUDIOFILE_CFLAGS) \
267 - $(GTKSPELL_CFLAGS) \
268 - $(STARTUP_NOTIFICATION_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
277 #include "internal.h"
280 +#include "gtkplugin.h"
282 #include "conversation.h"
284 -#include "gtkplugin.h"
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
293 #ifndef _GAIM_AWAY_H_
294 #define _GAIM_AWAY_H_
296 -#include "gtkgaim.h"
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
307 +extern GSList *away_messages;
308 +extern struct away_message *awaymessage;
309 +extern void *awaymenu;
310 +extern void *awayqueue;
311 +extern void *awayqueuestore;
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 *);
322 extern GSList *away_messages;
323 extern struct away_message *awaymessage;
324 extern GtkWidget *awaymenu;
326 extern void purge_away_queue(GSList **);
327 extern void do_im_back(GtkWidget *, GtkWidget *);
328 void create_away_mess(GtkWidget *, void *);
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
346 #include "gtkdialogs.h"
348 #include "gtkimhtml.h"
349 #include "gtkutils.h"
352 #define SECS_BEFORE_RESENDING_AUTORESPONSE 600
353 #define SEX_BEFORE_RESENDING_AUTORESPONSE "Only after you're married"
362 valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(awayqueuestore), &iter);
365 valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(awayqueuestore), &iter);
373 templist = message_queue;
377 struct queued_message *qm = (struct queued_message *)templist->data;
378 if ((qm->flags & GAIM_MESSAGE_RECV) && !strcmp(name, qm->name))
381 qm->flags = msgflags;
393 } else /* queue_to_docklet */
394 unread_message_queue = g_slist_append(unread_message_queue, qm);
396 @@ -1049,7 +1058,12 @@
399 /* apply default fonts and colors */
401 tmpmsg = stylize(gc->away, MSG_LEN);
403 + tmpmsg = (gchar*)g_malloc(MSG_LEN);
404 + g_snprintf(tmpmsg, MSG_LEN, "%s", gc->away);
407 /* Move this to oscar.c! */
408 buffy = gaim_str_sub_away_formatters(tmpmsg, alias);