Menu
▾
▴
pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(106) |
Oct
(334) |
Nov
(246) |
Dec
(145) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(42) |
Feb
(53) |
Mar
(232) |
Apr
(109) |
May
(137) |
Jun
(63) |
Jul
(26) |
Aug
(263) |
Sep
(193) |
Oct
(507) |
Nov
(440) |
Dec
(241) |
| 2003 |
Jan
(567) |
Feb
(195) |
Mar
(504) |
Apr
(481) |
May
(524) |
Jun
(522) |
Jul
(594) |
Aug
(502) |
Sep
(643) |
Oct
(508) |
Nov
(430) |
Dec
(377) |
| 2004 |
Jan
(361) |
Feb
(251) |
Mar
(219) |
Apr
(499) |
May
(461) |
Jun
(419) |
Jul
(314) |
Aug
(519) |
Sep
(416) |
Oct
(247) |
Nov
(305) |
Dec
(382) |
| 2005 |
Jan
(267) |
Feb
(282) |
Mar
(327) |
Apr
(338) |
May
(189) |
Jun
(400) |
Jul
(462) |
Aug
(530) |
Sep
(316) |
Oct
(523) |
Nov
(481) |
Dec
(650) |
| 2006 |
Jan
(536) |
Feb
(361) |
Mar
(287) |
Apr
(146) |
May
(101) |
Jun
(169) |
Jul
(221) |
Aug
(498) |
Sep
(300) |
Oct
(236) |
Nov
(209) |
Dec
(205) |
| 2007 |
Jan
(30) |
Feb
(23) |
Mar
(26) |
Apr
(15) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Eric W. <war...@us...> - 2001-09-28 07:46:39
|
Update of /cvsroot/gaim/gaim/src/protocols/irc In directory usw-pr-cvs1:/tmp/cvs-serv11370/protocols/irc Modified Files: irc.c Log Message: big reorg of code. list.c contains 0 gtk. Index: irc.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- irc.c 2001/09/21 08:59:42 1.35 +++ irc.c 2001/09/28 07:46:36 1.36 @@ -710,7 +710,7 @@ serv_finish_login(gc); if (bud_list_cache_exists(gc)) - do_import(NULL, gc); + do_import(gc, NULL); /* we don't call this now because otherwise some IRC servers might not like us */ idata->timer = g_timeout_add(20000, irc_request_buddy_update, gc); |
|
From: Eric W. <war...@us...> - 2001-09-28 07:46:39
|
Update of /cvsroot/gaim/gaim/src/protocols/jabber In directory usw-pr-cvs1:/tmp/cvs-serv11370/protocols/jabber Modified Files: jabber.c Log Message: big reorg of code. list.c contains 0 gtk. Index: jabber.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- jabber.c 2001/09/20 04:29:56 1.20 +++ jabber.c 2001/09/28 07:46:36 1.21 @@ -968,7 +968,7 @@ serv_finish_login(GJ_GC(j)); if (bud_list_cache_exists(GJ_GC(j))) - do_import(NULL, GJ_GC(j)); + do_import(GJ_GC(j), NULL); ((struct jabber_data *)GJ_GC(j)->proto_data)->did_import = TRUE; |
|
From: Eric W. <war...@us...> - 2001-09-28 07:46:38
|
Update of /cvsroot/gaim/gaim/src/protocols/icq In directory usw-pr-cvs1:/tmp/cvs-serv11370/protocols/icq Modified Files: gaim_icq.c Log Message: big reorg of code. list.c contains 0 gtk. Index: gaim_icq.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/icq/gaim_icq.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- gaim_icq.c 2001/09/17 23:25:10 1.12 +++ gaim_icq.c 2001/09/28 07:46:36 1.13 @@ -304,7 +304,7 @@ icq_ContactClear(id->link); if (bud_list_cache_exists(gc)) - do_import(NULL, gc); + do_import(gc, NULL); if (icq_Connect(link, "icq.mirabilis.com", 4000) < 1) { hide_login_progress(gc, "Unable to connect"); |
|
From: Eric W. <war...@us...> - 2001-09-28 05:17:19
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv13573
Modified Files:
gaim.h idle.c server.c
Log Message:
server.c: 30 / 935 3 %
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- gaim.h 2001/09/28 02:16:34 1.267
+++ gaim.h 2001/09/28 05:17:16 1.268
@@ -613,7 +613,7 @@
extern gchar *strip_html(gchar *);
/* Functions in idle.c */
-extern gint check_idle(struct gaim_connection *);
+extern gint check_idle(gpointer);
/* Functions in util.c */
extern char *normalize(const char *);
Index: idle.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/idle.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- idle.c 2001/09/27 19:17:10 1.31
+++ idle.c 2001/09/28 05:17:16 1.32
@@ -38,8 +38,9 @@
#include "prpl.h"
-gint check_idle(struct gaim_connection *gc)
+gint check_idle(gpointer data)
{
+ struct gaim_connection *gc = data;
time_t t;
#ifdef USE_SCREENSAVER
static XScreenSaverInfo *mit_info = NULL;
Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- server.c 2001/09/27 19:17:11 1.193
+++ server.c 2001/09/28 05:17:16 1.194
@@ -31,13 +31,6 @@
#include <sys/time.h>
#include <unistd.h>
#include <errno.h>
-#include <gtk/gtk.h>
-#ifdef USE_SCREENSAVER
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/scrnsaver.h>
-#endif /* USE_SCREENSAVER */
-extern int gaim_caps;
#include "prpl.h"
#include "multi.h"
#include "gaim.h"
@@ -107,7 +100,7 @@
if (gc->idle_timer > 0)
g_source_remove(gc->idle_timer);
- gc->idle_timer = g_timeout_add(20000, (GtkFunction)check_idle, gc);
+ gc->idle_timer = g_timeout_add(20000, check_idle, gc);
serv_touch_idle(gc);
time(&gc->login_time);
@@ -656,7 +649,6 @@
g_snprintf(b->name, sizeof(b->name), "%s", name);
handle_buddy_rename(b, who);
g_free(who);
- /*gtk_label_set_text(GTK_LABEL(b->label), b->name); */
/* okay lets save the new config... */
@@ -708,18 +700,10 @@
set_buddy(gc, b);
}
-static
-void close_warned(GtkWidget *w, GtkWidget *w2)
-{
- gtk_widget_destroy(w2);
-}
-
-
void serv_got_eviled(struct gaim_connection *gc, char *name, int lev)
{
char buf2[1024];
- GtkWidget *d, *label, *close;
plugin_event(event_warned, gc, name, (void *)lev, 0);
@@ -733,20 +717,7 @@
g_snprintf(buf2, sizeof(buf2), "%s has just been warned by %s.\nYour new warning level is %d%%",
gc->username, ((name == NULL)? "an anonymous person" : name), lev);
- d = gtk_dialog_new();
- gtk_widget_realize(d);
- aol_icon(d->window);
-
- label = gtk_label_new(buf2);
- gtk_widget_show(label);
- close = picture_button(d, _("Close"), cancel_xpm);
- gtk_widget_show(close);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox), label, FALSE, FALSE, 5);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->action_area), close, FALSE, FALSE, 5);
-
- gtk_window_set_title(GTK_WINDOW(d), "Warned");
- gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(close_warned), d);
- gtk_widget_show(d);
+ do_error_dialog(_("Warned"), buf2);
}
@@ -955,7 +926,7 @@
{
if (on && !gc->keepalive && blist) {
debug_printf("allowing NOP\n");
- gc->keepalive = g_timeout_add(60000, (GtkFunction)send_keepalive, gc);
+ gc->keepalive = g_timeout_add(60000, send_keepalive, gc);
} else if (!on && gc->keepalive > 0) {
debug_printf("removing NOP\n");
g_source_remove(gc->keepalive);
|
|
From: Eric W. <war...@us...> - 2001-09-28 02:16:38
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv8293
Modified Files:
about.c buddy.c gaim.h multi.c
Log Message:
(19:13:52) vanguardist: it's easy mmmkay
Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- about.c 2001/09/27 19:17:10 1.47
+++ about.c 2001/09/28 02:16:34 1.48
@@ -126,7 +126,8 @@
label =
gtk_label_new(
_("GAIM is a client that supports AOL's Instant Messenger protocol. It is written\n"
- "using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE));
+ "using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE "\n\n"
+ "IRC: #gaim on irc.openprojects.net"));
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- buddy.c 2001/09/27 19:17:10 1.245
+++ buddy.c 2001/09/28 02:16:34 1.246
@@ -126,7 +126,6 @@
static void remove_buddy_show(struct group_show *gs, struct buddy_show *bs);
static struct group_show *find_gs_by_bs(struct buddy_show *b);
static void update_num_group(struct group_show *gs);
-static void redo_buddy_list();
void handle_group_rename(struct group *g, char *prevname)
{
@@ -290,6 +289,33 @@
void destroy_buddy()
{
+ GSList *s = shows;
+ struct group_show *g;
+ GSList *m;
+ struct buddy_show *b;
+ while (s) {
+ g = (struct group_show *)s->data;
+ debug_printf("group_show still exists: %s\n", g->name);
+ m = g->members;
+ while (m) {
+ b = (struct buddy_show *)m->data;
+ debug_printf("buddy_show still exists: %s\n", b->name);
+ m = g_slist_remove(m, b);
+ if (b->log_timer > 0)
+ gtk_timeout_remove(b->log_timer);
+ b->log_timer = 0;
+ gtk_tree_remove_item(GTK_TREE(g->tree), b->item);
+ g_free(b->show);
+ g_free(b->name);
+ g_free(b);
+ }
+ gtk_tree_remove_item(GTK_TREE(buddies), g->item);
+ s = g_slist_remove(s, g);
+ g_free(g->name);
+ g_free(g);
+ }
+ shows = NULL;
+
if (blist)
gtk_widget_destroy(blist);
blist = NULL;
@@ -472,86 +498,6 @@
#endif
-
-void signoff_all(GtkWidget *w, gpointer d)
-{
- GSList *c = connections;
- struct gaim_connection *g = NULL;
-
- while (c) {
- g = (struct gaim_connection *)c->data;
- g->wants_to_die = TRUE;
- signoff(g);
- c = connections;
- }
-}
-
-void signoff(struct gaim_connection *gc)
-{
- plugin_event(event_signoff, gc, 0, 0, 0);
- system_log(log_signoff, gc, NULL, OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON);
- update_keepalive(gc, FALSE);
- convo_menu_remove(gc);
- remove_icon_data(gc);
- serv_close(gc);
- redo_buddy_list();
- build_edit_tree();
- do_away_menu();
- do_proto_menu();
- redo_convo_menus();
-#ifdef USE_APPLET
- if (connections)
- set_user_state(online);
-#endif
- update_connection_dependent_prefs();
-
- if (connections)
- return;
-
- {
- GSList *s = shows;
- struct group_show *g;
- GSList *m;
- struct buddy_show *b;
- while (s) {
- g = (struct group_show *)s->data;
- debug_printf("group_show still exists: %s\n", g->name);
- m = g->members;
- while (m) {
- b = (struct buddy_show *)m->data;
- debug_printf("buddy_show still exists: %s\n", b->name);
- m = g_slist_remove(m, b);
- if (b->log_timer > 0)
- gtk_timeout_remove(b->log_timer);
- b->log_timer = 0;
- gtk_tree_remove_item(GTK_TREE(g->tree), b->item);
- g_free(b->show);
- g_free(b->name);
- g_free(b);
- }
- gtk_tree_remove_item(GTK_TREE(buddies), g->item);
- s = g_slist_remove(s, g);
- g_free(g->name);
- g_free(g);
- }
- shows = NULL;
- }
-
- debug_printf("date: %s\n", full_date());
- destroy_all_dialogs();
- destroy_buddy();
-#ifdef USE_APPLET
- set_user_state(offline);
- applet_buddy_show = FALSE;
- applet_widget_unregister_callback(APPLET_WIDGET(applet), "signoff");
- remove_applet_away();
-#else
- show_login();
-#endif /* USE_APPLET */
- if (misc_options & OPT_MISC_BUDDY_TICKER)
- BuddyTickerSignoff();
-}
-
void handle_click_group(GtkWidget *widget, GdkEventButton *event, struct group *g)
{
if (event->type == GDK_2BUTTON_PRESS) {
@@ -991,7 +937,8 @@
}
-static void redo_buddy_list()
+/* you really shouldn't call this function */
+void redo_buddy_list()
{
/* so here we can safely assume that we don't have to add or delete anything, we
* just have to go through and reorder everything. remember, nothing is going to
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- gaim.h 2001/09/28 01:25:02 1.266
+++ gaim.h 2001/09/28 02:16:34 1.267
@@ -747,7 +747,7 @@
extern void refresh_buddy_window();
extern void toc_build_config(struct gaim_connection *, char *, int len, gboolean);
extern void signoff(struct gaim_connection *);
-extern void signoff_all(GtkWidget *, gpointer);
+extern void signoff_all(gpointer, gpointer);
extern void do_im_back();
extern void set_buddy(struct gaim_connection *, struct buddy *);
extern struct group *add_group(struct gaim_connection *, char *);
@@ -765,6 +765,7 @@
extern void remove_group(struct gaim_connection *, struct group *);
extern void toggle_buddy_pixmaps();
extern void gaim_separator(GtkWidget *);
+extern void redo_buddy_list(); /* you really shouldn't call this function */
/* Functions in away.c */
extern void rem_away_mess(GtkWidget *, struct away_message *);
Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- multi.c 2001/09/27 19:17:10 1.79
+++ multi.c 2001/09/28 02:16:34 1.80
@@ -1080,6 +1080,59 @@
gc->meter = NULL;
}
+void signoff_all(gpointer w, gpointer d)
+{
+ GSList *c = connections;
+ struct gaim_connection *g = NULL;
+
+ while (c) {
+ g = (struct gaim_connection *)c->data;
+ g->wants_to_die = TRUE;
+ signoff(g);
+ c = connections;
+ }
+}
+
+void signoff(struct gaim_connection *gc)
+{
+ /* core stuff */
+ debug_printf("date: %s\n", full_date());
+ plugin_event(event_signoff, gc, 0, 0, 0);
+ system_log(log_signoff, gc, NULL, OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON);
+ update_keepalive(gc, FALSE);
+
+ /* UI stuff */
+ convo_menu_remove(gc);
+ remove_icon_data(gc);
+ serv_close(gc);
+ redo_buddy_list();
+ build_edit_tree();
+ do_away_menu();
+ do_proto_menu();
+ redo_convo_menus();
+#ifdef USE_APPLET
+ if (connections)
+ set_user_state(online);
+#endif
+ update_connection_dependent_prefs();
+
+ if (connections)
+ return;
+
+ destroy_all_dialogs();
+ destroy_buddy();
+#ifdef USE_APPLET
+ set_user_state(offline);
+ applet_buddy_show = FALSE;
+ applet_widget_unregister_callback(APPLET_WIDGET(applet), "signoff");
+ remove_applet_away();
+#else
+ show_login();
+#endif /* USE_APPLET */
+ if (misc_options & OPT_MISC_BUDDY_TICKER)
+ BuddyTickerSignoff();
+}
+
struct aim_user *new_user(const char *name, int proto, int opts)
{
char *titles[4];
|
|
From: Eric W. <war...@us...> - 2001-09-28 01:25:05
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv31215
Modified Files:
aim.c conversation.c convo.h dialogs.c gaim.h gaimrc.c util.c
Log Message:
reorganization of some functions.
Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- aim.c 2001/09/27 19:17:10 1.159
+++ aim.c 2001/09/28 01:25:01 1.160
@@ -413,6 +413,23 @@
}
#endif
+static void set_first_user(char *name)
+{
+ struct aim_user *u;
+
+ u = find_user(name, -1);
+
+ if (!u) { /* new user */
+ u = g_new0(struct aim_user, 1);
+ g_snprintf(u->username, sizeof(u->username), "%s", name);
+ u->protocol = DEFAULT_PROTO;
+ aim_users = g_list_prepend(aim_users, u);
+ } else { /* user already exists */
+ aim_users = g_list_remove(aim_users, u);
+ aim_users = g_list_prepend(aim_users, u);
+ }
+ save_prefs();
+}
int main(int argc, char *argv[])
{
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- conversation.c 2001/09/27 20:54:02 1.267
+++ conversation.c 2001/09/28 01:25:02 1.268
@@ -1823,6 +1823,38 @@
update_checkbox(cnv);
}
+int set_dispstyle(int chat)
+{
+ int dispstyle;
+
+ if (chat) {
+ switch (chat_options & (OPT_CHAT_BUTTON_TEXT | OPT_CHAT_BUTTON_XPM)) {
+ case OPT_CHAT_BUTTON_TEXT:
+ dispstyle = 1;
+ break;
+ case OPT_CHAT_BUTTON_XPM:
+ dispstyle = 0;
+ break;
+ default: /* both or neither */
+ dispstyle = 2;
+ break;
+ }
+ } else {
+ switch (im_options & (OPT_IM_BUTTON_TEXT | OPT_IM_BUTTON_XPM)) {
+ case OPT_IM_BUTTON_TEXT:
+ dispstyle = 1;
+ break;
+ case OPT_IM_BUTTON_XPM:
+ dispstyle = 0;
+ break;
+ default: /* both or neither */
+ dispstyle = 2;
+ break;
+ }
+ }
+ return dispstyle;
+}
+
void update_convo_add_button(struct conversation *c)
{
int dispstyle = set_dispstyle(0);
Index: convo.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/convo.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- convo.h 2000/10/10 00:02:02 1.9
+++ convo.h 2001/09/28 01:25:02 1.10
@@ -48,6 +48,7 @@
extern void add_callback(GtkWidget *, struct conversation *);
/* now both */
+extern int set_dispstyle (int);
extern void info_callback(GtkWidget *, struct conversation *);
extern void do_bold(GtkWidget *, GtkWidget *);
extern void do_italic(GtkWidget *, GtkWidget *);
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -d -r1.251 -r1.252
--- dialogs.c 2001/09/27 23:29:23 1.251
+++ dialogs.c 2001/09/28 01:25:02 1.252
@@ -68,6 +68,8 @@
#include "pixmaps/wink.xpm"
#include "pixmaps/yell.xpm"
+#include "pixmaps/aimicon.xpm"
+
#include "pixmaps/aol_icon.xpm"
#include "pixmaps/free_icon.xpm"
#include "pixmaps/dt_icon.xpm"
@@ -4085,3 +4087,128 @@
}
#endif /* USE_PERL */
+
+static GdkPixmap *icon_pm = NULL;
+static GdkBitmap *icon_bm = NULL;
+
+void aol_icon(GdkWindow *w)
+{
+#ifndef _WIN32
+ if (icon_pm == NULL) {
+ icon_pm = gdk_pixmap_create_from_xpm_d(w, &icon_bm, NULL, (gchar **)aimicon_xpm);
+ }
+ gdk_window_set_icon(w, NULL, icon_pm, icon_bm);
+ if (mainwindow)
+ gdk_window_set_group(w, mainwindow->window);
+#endif
+}
+
+GtkWidget *picture_button(GtkWidget *window, char *text, char **xpm)
+{
+ GtkWidget *button;
+ GtkWidget *button_box, *button_box_2, *button_box_3;
+ GtkWidget *label;
+ GdkBitmap *mask;
+ GdkPixmap *pm;
+ GtkWidget *pixmap;
+
+ button = gtk_button_new();
+ if (misc_options & OPT_MISC_COOL_LOOK)
+ gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+
+ button_box = gtk_hbox_new(FALSE, 5);
+ gtk_container_add(GTK_CONTAINER(button), button_box);
+
+ button_box_2 = gtk_hbox_new(FALSE, 0);
+ button_box_3 = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(button_box), button_box_3, TRUE, TRUE, 0);
+ pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
+ pixmap = gtk_pixmap_new(pm, mask);
+ gtk_box_pack_end(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
+
+ if (text) {
+ label = gtk_label_new(text);
+ gtk_box_pack_start(GTK_BOX(button_box_3), label, FALSE, FALSE, 2);
+ gtk_widget_show(label);
+ }
+
+ gtk_widget_show(pixmap);
+ gtk_widget_show(button_box_2);
+ gtk_widget_show(button_box_3);
+ gtk_widget_show(button_box);
+
+/* this causes clipping on lots of buttons with long text */
+/* gtk_widget_set_usize(button, 75, 30);*/
+ gtk_widget_show(button);
+ gdk_pixmap_unref(pm);
+ gdk_bitmap_unref(mask);
+
+ return button;
+}
+
+static GtkTooltips *button_tips = NULL;
+GtkWidget *picture_button2(GtkWidget *window, char *text, char **xpm, short dispstyle)
+{
+ GtkWidget *button;
+ GtkWidget *button_box, *button_box_2;
+ GdkBitmap *mask;
+ GdkPixmap *pm;
+ GtkWidget *pixmap;
+ GtkWidget *label;
+
+ if (!button_tips)
+ button_tips = gtk_tooltips_new();
+ button = gtk_button_new();
+ if (misc_options & OPT_MISC_COOL_LOOK)
+ gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+
+ button_box = gtk_hbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(button), button_box);
+
+ button_box_2 = gtk_vbox_new(FALSE, 0);
+
+ gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
+ gtk_widget_show(button_box_2);
+ gtk_widget_show(button_box);
+ if (dispstyle == 2 || dispstyle == 0) {
+ pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
+ pixmap = gtk_pixmap_new(pm, mask);
+ gtk_box_pack_start(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
+
+ gtk_widget_show(pixmap);
+
+ gdk_pixmap_unref(pm);
+ gdk_bitmap_unref(mask);
+ }
+
+ if (dispstyle == 2 || dispstyle == 1) {
+ label = gtk_label_new(text);
+ gtk_widget_show(label);
+ gtk_box_pack_end(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
+ }
+
+ gtk_tooltips_set_tip(button_tips, button, text, "Gaim");
+ gtk_widget_show(button);
+ return button;
+}
+
+int file_is_dir(const char *path, GtkWidget *w)
+{
+ struct stat st;
+ char *name;
+
+ if (stat(path, &st) == 0 && S_ISDIR(st.st_mode)) {
+ /* append a / if needed */
+ if (path[strlen(path) - 1] != '/') {
+ name = g_strconcat(path, "/", NULL);
+ } else {
+ name = g_strdup(path);
+ }
+ gtk_file_selection_set_filename(GTK_FILE_SELECTION(w), name);
+ g_free(name);
+ return 1;
+ }
+
+ return 0;
+}
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- gaim.h 2001/09/27 20:32:59 1.265
+++ gaim.h 2001/09/28 01:25:02 1.266
@@ -617,7 +617,6 @@
/* Functions in util.c */
extern char *normalize(const char *);
-extern char *escape_text2(const char *);
extern char *tobase64(const char *);
extern void frombase64(const char *, char **, int *);
extern gint clean_pid(gpointer);
@@ -635,9 +634,7 @@
extern void translate_lst (FILE *, char *);
extern void translate_blt (FILE *, char *);
extern char *stylize(gchar *, int);
-extern int set_dispstyle (int);
extern void show_usage (int, char *);
-extern void set_first_user (char *);
extern int do_auto_login (char *);
extern int file_is_dir (const char *, GtkWidget *);
extern char *gaim_user_dir();
Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- gaimrc.c 2001/09/27 19:17:10 1.81
+++ gaimrc.c 2001/09/28 01:25:02 1.82
@@ -165,7 +165,7 @@
return -1;
}
-void filter_break(char *msg)
+static void filter_break(char *msg)
{
char *c;
int mc;
@@ -190,6 +190,40 @@
g_free(c);
}
+static char *escape_text2(const char *msg)
+{
+ char *c, *cpy;
+ char *woo;
+ int cnt = 0;
+ /* Assumes you have a buffer able to cary at least BUF_LEN * 2 bytes */
+
+ woo = malloc(strlen(msg) * 4 + 1);
+ cpy = g_strndup(msg, 2048);
+ c = cpy;
+ while (*c) {
+ switch (*c) {
+ case '\n':
+ woo[cnt++] = '<';
+ woo[cnt++] = 'B';
+ woo[cnt++] = 'R';
+ woo[cnt++] = '>';
+ break;
+ case '{':
+ case '}':
+ case '\\':
+ case '"':
+ woo[cnt++] = '\\';
+ /* Fall through */
+ default:
+ woo[cnt++] = *c;
+ }
+ c++;
+ }
+ woo[cnt] = '\0';
+
+ g_free(cpy);
+ return woo;
+}
static void gaimrc_read_away(FILE *f)
{
Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- util.c 2001/09/27 19:17:11 1.104
+++ util.c 2001/09/28 01:25:02 1.105
@@ -31,16 +31,11 @@
#include <sys/stat.h>
#include <string.h>
#include <sys/wait.h>
-#include <gtk/gtk.h>
#include <ctype.h>
#include <math.h>
-#include <pixmaps/aimicon.xpm>
#include "gaim.h"
#include "prpl.h"
-static GdkPixmap *icon_pm = NULL;
-static GdkBitmap *icon_bm = NULL;
-
char *full_date()
{
char *date;
@@ -473,45 +468,6 @@
return open_gaim_log_file("system", &x);
}
-char *escape_text2(const char *msg)
-{
- char *c, *cpy;
- char *woo;
- int cnt = 0;
- /* Assumes you have a buffer able to cary at least BUF_LEN * 2 bytes */
- if (strlen(msg) > BUF_LEN) {
- fprintf(stderr, "Warning: truncating message to 2048 bytes\n");
- }
-
- woo = malloc(strlen(msg) * 4 + 1);
- cpy = g_strndup(msg, 2048);
- c = cpy;
- while (*c) {
- switch (*c) {
- case '\n':
- woo[cnt++] = '<';
- woo[cnt++] = 'B';
- woo[cnt++] = 'R';
- woo[cnt++] = '>';
- break;
- case '{':
- case '}':
- case '\\':
- case '"':
- woo[cnt++] = '\\';
- /* Fall through */
- default:
- woo[cnt++] = *c;
- }
- c++;
- }
- woo[cnt] = '\0';
-
- g_free(cpy);
- return woo;
-}
-
-
char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" "0123456789+/";
@@ -681,18 +637,6 @@
return FALSE;
}
-void aol_icon(GdkWindow *w)
-{
-#ifndef _WIN32
- if (icon_pm == NULL) {
- icon_pm = gdk_pixmap_create_from_xpm_d(w, &icon_bm, NULL, (gchar **)aimicon_xpm);
- }
- gdk_window_set_icon(w, NULL, icon_pm, icon_bm);
- if (mainwindow)
- gdk_window_set_group(w, mainwindow->window);
-#endif
-}
-
struct aim_user *find_user(const char *name, int protocol)
{
char *who = g_strdup(normalize(name));
@@ -772,95 +716,6 @@
return (cpy);
}
-GtkWidget *picture_button(GtkWidget *window, char *text, char **xpm)
-{
- GtkWidget *button;
- GtkWidget *button_box, *button_box_2, *button_box_3;
- GtkWidget *label;
- GdkBitmap *mask;
- GdkPixmap *pm;
- GtkWidget *pixmap;
-
- button = gtk_button_new();
- if (misc_options & OPT_MISC_COOL_LOOK)
- gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-
- button_box = gtk_hbox_new(FALSE, 5);
- gtk_container_add(GTK_CONTAINER(button), button_box);
-
- button_box_2 = gtk_hbox_new(FALSE, 0);
- button_box_3 = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(button_box), button_box_3, TRUE, TRUE, 0);
- pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
- pixmap = gtk_pixmap_new(pm, mask);
- gtk_box_pack_end(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
-
- if (text) {
- label = gtk_label_new(text);
- gtk_box_pack_start(GTK_BOX(button_box_3), label, FALSE, FALSE, 2);
- gtk_widget_show(label);
- }
-
- gtk_widget_show(pixmap);
- gtk_widget_show(button_box_2);
- gtk_widget_show(button_box_3);
- gtk_widget_show(button_box);
-
-/* this causes clipping on lots of buttons with long text */
-/* gtk_widget_set_usize(button, 75, 30);*/
- gtk_widget_show(button);
- gdk_pixmap_unref(pm);
- gdk_bitmap_unref(mask);
-
- return button;
-}
-
-static GtkTooltips *button_tips = NULL;
-GtkWidget *picture_button2(GtkWidget *window, char *text, char **xpm, short dispstyle)
-{
- GtkWidget *button;
- GtkWidget *button_box, *button_box_2;
- GdkBitmap *mask;
- GdkPixmap *pm;
- GtkWidget *pixmap;
- GtkWidget *label;
-
- if (!button_tips)
- button_tips = gtk_tooltips_new();
- button = gtk_button_new();
- if (misc_options & OPT_MISC_COOL_LOOK)
- gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-
- button_box = gtk_hbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(button), button_box);
-
- button_box_2 = gtk_vbox_new(FALSE, 0);
-
- gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
- gtk_widget_show(button_box_2);
- gtk_widget_show(button_box);
- if (dispstyle == 2 || dispstyle == 0) {
- pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
- pixmap = gtk_pixmap_new(pm, mask);
- gtk_box_pack_start(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
-
- gtk_widget_show(pixmap);
-
- gdk_pixmap_unref(pm);
- gdk_bitmap_unref(mask);
- }
-
- if (dispstyle == 2 || dispstyle == 1) {
- label = gtk_label_new(text);
- gtk_widget_show(label);
- gtk_box_pack_end(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
- }
-
- gtk_tooltips_set_tip(button_tips, button, text, "Gaim");
- gtk_widget_show(button);
- return button;
-}
/* remove leading whitespace from a string */
@@ -1044,39 +899,6 @@
return buf;
}
-int set_dispstyle(int chat)
-{
- int dispstyle;
-
- if (chat) {
- switch (chat_options & (OPT_CHAT_BUTTON_TEXT | OPT_CHAT_BUTTON_XPM)) {
- case OPT_CHAT_BUTTON_TEXT:
- dispstyle = 1;
- break;
- case OPT_CHAT_BUTTON_XPM:
- dispstyle = 0;
- break;
- default: /* both or neither */
- dispstyle = 2;
- break;
- }
- } else {
- switch (im_options & (OPT_IM_BUTTON_TEXT | OPT_IM_BUTTON_XPM)) {
- case OPT_IM_BUTTON_TEXT:
- dispstyle = 1;
- break;
- case OPT_IM_BUTTON_XPM:
- dispstyle = 0;
- break;
- default: /* both or neither */
- dispstyle = 2;
- break;
- }
- }
- return dispstyle;
-}
-
-
void show_usage(int mode, char *name)
{
switch (mode) {
@@ -1099,25 +921,6 @@
}
-void set_first_user(char *name)
-{
- struct aim_user *u;
-
- u = find_user(name, -1);
-
- if (!u) { /* new user */
- u = g_new0(struct aim_user, 1);
- g_snprintf(u->username, sizeof(u->username), "%s", name);
- u->protocol = DEFAULT_PROTO;
- aim_users = g_list_prepend(aim_users, u);
- } else { /* user already exists */
- aim_users = g_list_remove(aim_users, u);
- aim_users = g_list_prepend(aim_users, u);
- }
- save_prefs();
-}
-
-
/* <name> is a comma-separated list of names, or NULL
if NULL and there is at least one user defined in .gaimrc, try to login.
if not NULL, parse <name> into separate strings, look up each one in
@@ -1154,27 +957,6 @@
return retval;
}
-
-int file_is_dir(const char *path, GtkWidget *w)
-{
- struct stat st;
- char *name;
-
- if (stat(path, &st) == 0 && S_ISDIR(st.st_mode)) {
- /* append a / if needed */
- if (path[strlen(path) - 1] != '/') {
- name = g_strconcat(path, "/", NULL);
- } else {
- name = g_strdup(path);
- }
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(w), name);
- g_free(name);
- return 1;
- }
-
- return 0;
-}
-
GSList *message_split(char *message, int limit)
{
static GSList *ret = NULL;
@@ -1280,7 +1062,7 @@
if (mesg == NULL) {
/* Use default message */
- do_away_message((GtkWidget *)NULL, default_away);
+ do_away_message(NULL, default_away);
} else {
/* Use argument */
while (awy) {
@@ -1293,7 +1075,7 @@
}
if (message == NULL)
message = default_away;
- do_away_message((GtkWidget *)NULL, message);
+ do_away_message(NULL, message);
}
return;
}
|
|
From: Eric W. <war...@us...> - 2001-09-27 23:58:52
|
Update of /cvsroot/gaim/gaim/src/protocols/yahoo In directory usw-pr-cvs1:/tmp/cvs-serv12638 Modified Files: rxhandlers.c Log Message: this has bothered me Index: rxhandlers.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/rxhandlers.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- rxhandlers.c 2001/08/29 23:49:18 1.3 +++ rxhandlers.c 2001/09/27 23:58:48 1.4 @@ -222,6 +222,7 @@ break; *tmp++ = '\0'; str_array[2] = tmp; + str_array[2][strlen(str_array[2]) - 1] = 0; if (sess->callbacks[YAHOO_HANDLE_MESSAGE].function) (*sess->callbacks[YAHOO_HANDLE_MESSAGE].function)(sess, pkt->nick2, str_array[0], |
|
From: Eric W. <war...@us...> - 2001-09-27 23:29:30
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv3627 Modified Files: dialogs.c Log Message: thanks decklin Index: dialogs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v retrieving revision 1.250 retrieving revision 1.251 diff -u -d -r1.250 -r1.251 --- dialogs.c 2001/09/27 19:17:10 1.250 +++ dialogs.c 2001/09/27 23:29:23 1.251 @@ -4009,6 +4009,8 @@ gtk_widget_show_all(rename_bud_dialog); } +#ifdef USE_PERL + static GtkWidget *perl_config = NULL; static char *perl_last_dir = NULL; @@ -4081,3 +4083,5 @@ gtk_widget_show(perl_config); gdk_window_raise(perl_config->window); } + +#endif /* USE_PERL */ |
|
From: Eric W. <war...@us...> - 2001-09-27 22:48:20
|
Update of /cvsroot/gaim/gaim/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv24163
Modified Files:
lagmeter.c
Log Message:
hi
Index: lagmeter.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/lagmeter.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- lagmeter.c 2001/09/24 16:35:27 1.15
+++ lagmeter.c 2001/09/27 22:48:16 1.16
@@ -59,13 +59,16 @@
static void check_lag(struct gaim_connection *gc, char **who, char **message, void *m) {
char *name;
+ gboolean good = FALSE;
if (gc != my_gc)
return;
name = g_strdup(normalize(*who));
- if (!strcasecmp(normalize(gc->username), name) &&
- (*message != NULL) &&
- !strcmp(*message, MY_LAG_STRING)) {
+ if (!g_strcasecmp(normalize(gc->username), name))
+ good = TRUE;
+ if (!g_strcasecmp(normalize(gc->displayname), name))
+ good = TRUE;
+ if (good && (*message != NULL) && !strcmp(*message, MY_LAG_STRING)) {
struct timeval tv;
int ms;
@@ -96,7 +99,9 @@
g_free(buf);
} else
serv_send_im(my_gc, my_gc->username, m, 1);
- } else
+ } else if (strcmp(my_gc->username, my_gc->displayname))
+ serv_send_im(my_gc, my_gc->displayname, m, 1);
+ else
serv_send_im(my_gc, my_gc->username, m, 1);
g_free(m);
return TRUE;
|
|
From: Eric W. <war...@us...> - 2001-09-27 20:54:05
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv26358
Modified Files:
conversation.c
Log Message:
i like this color better
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- conversation.c 2001/09/27 20:32:59 1.266
+++ conversation.c 2001/09/27 20:54:02 1.267
@@ -1443,7 +1443,7 @@
else
g_snprintf(str, 1024, "***%s", who);
if (flags & WFLAG_NICK)
- strcpy(colour, "#ef7f00");
+ strcpy(colour, "#af7f00");
else
strcpy(colour, "#062585");
} else {
@@ -1453,7 +1453,7 @@
else
g_snprintf(str, 1024, "%s:", who);
if (flags & WFLAG_NICK)
- strcpy(colour, "#ef7f00");
+ strcpy(colour, "#af7f00");
else if (flags & WFLAG_RECV)
strcpy(colour, "#ff0000");
else if (flags & WFLAG_SEND)
|
|
From: Eric W. <war...@us...> - 2001-09-27 20:33:02
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv20741
Modified Files:
buddy_chat.c conversation.c gaim.h
Log Message:
i need to go to class. but just because i need to do something doesn't mean i will, especially when what i need to do is related to school.
Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- buddy_chat.c 2001/09/27 19:17:10 1.116
+++ buddy_chat.c 2001/09/27 20:32:59 1.117
@@ -25,6 +25,7 @@
#include <string.h>
#include <sys/time.h>
#include <unistd.h>
+#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <gtk/gtk.h>
@@ -469,6 +470,46 @@
return FALSE;
}
+static gboolean find_nick(struct gaim_connection *gc, char *message)
+{
+ char *msg = g_strdup(message), *who, *p;
+ int n;
+ g_strdown(msg);
+
+ who = g_strdup(gc->username);
+ n = strlen(who);
+ g_strdown(who);
+
+ if ((p = strstr(msg, who)) != NULL) {
+ if ((p == msg) || (!isalnum(*(p - 1)) && !isalnum(*(p + n)))) {
+ g_free(who);
+ g_free(msg);
+ return TRUE;
+ }
+ }
+ g_free(who);
+
+ if (g_strcasecmp(gc->username, gc->displayname)) {
+ g_free(msg);
+ return FALSE;
+ }
+
+ who = g_strdup(gc->displayname);
+ n = strlen(who);
+ g_strdown(who);
+
+ if ((p = strstr(msg, who)) != NULL) {
+ if ((p == msg) || (!isalnum(*(p - 1)) && !isalnum(*(p + n)))) {
+ g_free(who);
+ g_free(msg);
+ return TRUE;
+ }
+ }
+ g_free(who);
+ g_free(msg);
+ return FALSE;
+}
+
void chat_write(struct conversation *b, char *who, int flag, char *message, time_t mtime)
{
GList *ignore = b->ignored;
@@ -488,11 +529,11 @@
if (!(flag & WFLAG_WHISPER)) {
str = g_strdup(normalize (who));
- if (!g_strcasecmp(str, normalize (b->gc->username))) {
+ if (!g_strcasecmp(str, normalize(b->gc->username))) {
if (b->makesound && (sound_options & OPT_SOUND_CHAT_YOU_SAY))
play_sound(CHAT_YOU_SAY);
flag |= WFLAG_SEND;
- } else if (!g_strcasecmp(str, normalize (b->gc->displayname))) {
+ } else if (!g_strcasecmp(str, normalize(b->gc->displayname))) {
if (b->makesound && (sound_options & OPT_SOUND_CHAT_YOU_SAY))
play_sound(CHAT_YOU_SAY);
flag |= WFLAG_SEND;
@@ -503,6 +544,9 @@
}
g_free(str);
}
+
+ if ((flag & WFLAG_RECV) && find_nick(b->gc, message))
+ flag |= WFLAG_NICK;
write_to_conv(b, message, flag, who, mtime);
}
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- conversation.c 2001/09/27 19:17:10 1.265
+++ conversation.c 2001/09/27 20:32:59 1.266
@@ -1429,11 +1429,11 @@
if (meify(what)) {
str = g_malloc(1024);
g_snprintf(str, 1024, "***%s", who);
- strcpy(colour, "#6C2585\0");
+ strcpy(colour, "#6C2585");
} else {
str = g_malloc(1024);
g_snprintf(str, 1024, "*%s*:", who);
- strcpy(colour, "#00ff00\0");
+ strcpy(colour, "#00ff00");
}
} else {
if (meify(what)) {
@@ -1442,14 +1442,19 @@
g_snprintf(str, 1024, "%s ***%s", AUTO_RESPONSE, who);
else
g_snprintf(str, 1024, "***%s", who);
- strcpy(colour, "#062585\0");
+ if (flags & WFLAG_NICK)
+ strcpy(colour, "#ef7f00");
+ else
+ strcpy(colour, "#062585");
} else {
str = g_malloc(1024);
if (flags & WFLAG_AUTO)
g_snprintf(str, 1024, "%s %s", who, AUTO_RESPONSE);
else
g_snprintf(str, 1024, "%s:", who);
- if (flags & WFLAG_RECV)
+ if (flags & WFLAG_NICK)
+ strcpy(colour, "#ef7f00");
+ else if (flags & WFLAG_RECV)
strcpy(colour, "#ff0000");
else if (flags & WFLAG_SEND)
strcpy(colour, "#0000ff");
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- gaim.h 2001/09/27 17:44:23 1.264
+++ gaim.h 2001/09/27 20:32:59 1.265
@@ -63,12 +63,13 @@
#define UC_NORMAL 8
#define UC_UNAVAILABLE 16
-#define WFLAG_SEND 1
-#define WFLAG_RECV 2
-#define WFLAG_AUTO 4
-#define WFLAG_WHISPER 8
-#define WFLAG_FILERECV 16
-#define WFLAG_SYSTEM 32
+#define WFLAG_SEND 0x01
+#define WFLAG_RECV 0x02
+#define WFLAG_AUTO 0x04
+#define WFLAG_WHISPER 0x08
+#define WFLAG_FILERECV 0x10
+#define WFLAG_SYSTEM 0x20
+#define WFLAG_NICK 0x40
#define AUTO_RESPONSE "<AUTO-REPLY> : "
|
|
From: Eric W. <war...@us...> - 2001-09-27 19:27:55
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar In directory usw-pr-cvs1:/tmp/cvs-serv31670/src/protocols/oscar Modified Files: Makefile.am Added Files: md5.c md5.h Log Message: you got the mother and the kids, you got the guy and his date we all get mad. we all get late. Looks like somebody! forgot about us! Standing on a corner, waiting for a bus! say hey mister driver man, don't be slow cuz i've got somewhere i've gotta go say hey mister driver man, drive that thing fast! my precious time keeps, slippin' past! let's call the mayor, let's complain look what the city's done to us again tied up in traffic, what do you know the damn city bus, moves so slow --Violent Femmes Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 2001/09/27 02:56:38 1.3 +++ Makefile.am 2001/09/27 19:27:52 1.4 @@ -1,4 +1,4 @@ -EXTRA_DIST = aim.h aim_cbtypes.h aim_internal.h faimconfig.h README \ +EXTRA_DIST = aim.h aim_cbtypes.h aim_internal.h faimconfig.h md5.h README \ CHANGES COPYING BUGS AUTHORS pkgdir = $(libdir)/gaim @@ -24,6 +24,7 @@ im.c \ info.c \ login.c \ + md5.c \ meta.c \ misc.c \ msgcookie.c \ @@ -56,6 +57,7 @@ im.c \ info.c \ login.c \ + md5.c \ meta.c \ misc.c \ msgcookie.c \ |
|
From: Eric W. <war...@us...> - 2001-09-27 19:27:55
|
Update of /cvsroot/gaim/gaim/src/protocols/msn In directory usw-pr-cvs1:/tmp/cvs-serv31670/src/protocols/msn Modified Files: Makefile.am Added Files: md5.c md5.h Log Message: you got the mother and the kids, you got the guy and his date we all get mad. we all get late. Looks like somebody! forgot about us! Standing on a corner, waiting for a bus! say hey mister driver man, don't be slow cuz i've got somewhere i've gotta go say hey mister driver man, drive that thing fast! my precious time keeps, slippin' past! let's call the mayor, let's complain look what the city's done to us again tied up in traffic, what do you know the damn city bus, moves so slow --Violent Femmes Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/msn/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile.am 2001/09/27 02:56:38 1.4 +++ Makefile.am 2001/09/27 19:27:52 1.5 @@ -1,4 +1,4 @@ -EXTRA_DIST = PROTOCOL +EXTRA_DIST = PROTOCOL md5.h pkgdir = $(libdir)/gaim @@ -11,7 +11,7 @@ pkg_LTLIBRARIES = noinst_LIBRARIES = libmsn.a -libmsn_a_SOURCES = msn.c +libmsn_a_SOURCES = msn.c md5.c else @@ -19,6 +19,6 @@ pkg_LTLIBRARIES = libmsn.la noinst_LIBRARIES = -libmsn_la_SOURCES = msn.c +libmsn_la_SOURCES = msn.c md5.c endif |
|
From: Eric W. <war...@us...> - 2001-09-27 19:27:55
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv31670/src Modified Files: Makefile.am Removed Files: md5.c md5.h Log Message: you got the mother and the kids, you got the guy and his date we all get mad. we all get late. Looks like somebody! forgot about us! Standing on a corner, waiting for a bus! say hey mister driver man, don't be slow cuz i've got somewhere i've gotta go say hey mister driver man, drive that thing fast! my precious time keeps, slippin' past! let's call the mayor, let's complain look what the city's done to us again tied up in traffic, what do you know the damn city bus, moves so slow --Violent Femmes Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- Makefile.am 2001/09/27 02:56:38 1.37 +++ Makefile.am 2001/09/27 19:27:52 1.38 @@ -17,7 +17,6 @@ gtkticker.c \ html.c \ idle.c \ - md5.c \ multi.c \ perl.c \ plugins.c \ @@ -48,7 +47,6 @@ gtkticker.c \ html.c \ idle.c \ - md5.c \ multi.c \ perl.c \ plugins.c \ @@ -78,7 +76,6 @@ gtkimhtml.h \ gtkspell.h \ gtkticker.h \ - md5.h \ multi.h \ prpl.h \ proxy.h --- md5.c DELETED --- --- md5.h DELETED --- |
|
From: Eric W. <war...@us...> - 2001-09-27 19:17:15
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv29335
Modified Files:
about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c
conversation.c dialogs.c gaimrc.c html.c idle.c multi.c
plugins.c prefs.c proxy.c prpl.c server.c sound.c util.c
Log Message:
reformatting. nothing else.
Index: about.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/about.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- about.c 2001/09/26 19:22:19 1.46
+++ about.c 2001/09/27 19:17:10 1.47
@@ -115,7 +115,7 @@
/* Left side, TOP */
style = gtk_widget_get_style(about);
pm = gdk_pixmap_create_from_xpm_d(about->window, &bm,
- &style->bg[GTK_STATE_NORMAL], (gchar **) aol_logo);
+ &style->bg[GTK_STATE_NORMAL], (gchar **)aol_logo);
pixmap = gtk_pixmap_new(pm, bm);
gdk_pixmap_unref(pm);
@@ -123,18 +123,21 @@
gtk_box_pack_start(GTK_BOX(fbox), pixmap, FALSE, FALSE, 0);
- label = gtk_label_new(_("GAIM is a client that supports AOL's Instant Messenger protocol. It is written\n"
- "using Gtk+ and is licensed under the GPL.\n\n"
- "URL: " WEBSITE));
+ label =
+ gtk_label_new(
+ _("GAIM is a client that supports AOL's Instant Messenger protocol. It is written\n"
+ "using Gtk+ and is licensed under the GPL.\n\n" "URL: " WEBSITE));
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
gtk_box_pack_start(GTK_BOX(fbox), label, TRUE, TRUE, 0);
- text = gtk_text_new(NULL, NULL);
+ text = gtk_text_new(NULL, NULL);
- gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL, _("Rob Flynn (maintainer) ro...@ma...\nEric Warmenhoven (lead coder) war...@ya...\n\nBenjamin Miller\nDecklin Foster\nJim Duchek\nMark Spencer (original author) mar...@ma..."), 198);
-
+ gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
+ _("Rob Flynn (maintainer) ro...@ma...\nEric Warmenhoven (lead coder) war...@ya...\n\nBenjamin Miller\nDecklin Foster\nJim Duchek\nMark Spencer (original author) mar...@ma..."),
+ 198);
+
gtk_widget_show(text);
gtk_box_pack_start(GTK_BOX(fbox), text, TRUE, TRUE, 0);
@@ -214,8 +217,7 @@
close = picture_button(help, _("Close"), cancel_xpm);
gtk_box_pack_end(GTK_BOX(hbox), close, FALSE, FALSE, 5);
- gtk_signal_connect(GTK_OBJECT(close), "clicked",
- GTK_SIGNAL_FUNC(destroy_help), NULL);
+ gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(destroy_help), NULL);
pm = gdk_pixmap_create_from_xpm_d(help->window, &bm, NULL, panic_xpm);
pix = gtk_pixmap_new(pm, bm);
Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- aim.c 2001/09/20 19:09:42 1.158
+++ aim.c 2001/09/27 19:17:10 1.159
@@ -244,7 +244,7 @@
style = gtk_widget_get_style(mainwindow);
pm = gdk_pixmap_create_from_xpm_d(mainwindow->window, &mask,
- &style->bg[GTK_STATE_NORMAL], (gchar **) aol_logo);
+ &style->bg[GTK_STATE_NORMAL], (gchar **)aol_logo);
pmw = gtk_pixmap_new(pm, mask);
gtk_table_attach(GTK_TABLE(table), pmw, 0, 2, 0, 1, 0, 0, 5, 5);
gtk_widget_show(pmw);
@@ -383,21 +383,21 @@
break;
case SIGSEGV:
fprintf(stderr, "Gaim has segfaulted and attempted to dump a core file.\n"
- "This is a bug in the software and has happened through\n"
- "no fault of your own.\n\n"
- "It is possible that this bug is already fixed in CVS.\n"
- "You can get a tarball of CVS from the Gaim website, at\n"
- WEBSITE "gaim-CVS.tar.gz.\n\n"
- "If you are already using CVS, or can reproduce the crash\n"
- "using the CVS version, please notify the gaim maintainers\n"
- "by reporting a bug at\n"
- WEBSITE "bug.php3\n\n"
- "Please make sure to specify what you were doing at the time,\n"
- "and post the backtrace from the core file. If you do not know\n"
- "how to get the backtrace, please get instructions at\n"
- WEBSITE "gdb.shtml. If you need further\n"
- "assistance, please IM either EWarmenhoven or RobFlynn and\n"
- "they can help you.\n");
+ "This is a bug in the software and has happened through\n"
+ "no fault of your own.\n\n"
+ "It is possible that this bug is already fixed in CVS.\n"
+ "You can get a tarball of CVS from the Gaim website, at\n"
+ WEBSITE "gaim-CVS.tar.gz.\n\n"
+ "If you are already using CVS, or can reproduce the crash\n"
+ "using the CVS version, please notify the gaim maintainers\n"
+ "by reporting a bug at\n"
+ WEBSITE "bug.php3\n\n"
+ "Please make sure to specify what you were doing at the time,\n"
+ "and post the backtrace from the core file. If you do not know\n"
+ "how to get the backtrace, please get instructions at\n"
+ WEBSITE "gdb.shtml. If you need further\n"
+ "assistance, please IM either EWarmenhoven or RobFlynn and\n"
+ "they can help you.\n");
abort();
break;
default:
@@ -427,7 +427,8 @@
{"acct", 'a', POPT_ARG_NONE, &opt_acct, 'a',
"Display account editor window", NULL},
{"away", 'w', POPT_ARG_STRING, NULL, 'w',
- "Make away on signon (optional argument MESG specifies name of away message to use)", "[MESG]"},
+ "Make away on signon (optional argument MESG specifies name of away message to use)",
+ "[MESG]"},
{"login", 'l', POPT_ARG_STRING, NULL, 'l',
"Automatically login (optional argument NAME specifies account(s) to use)", "[NAME]"},
{"user", 'u', POPT_ARG_STRING, &opt_user_arg, 'u',
@@ -439,9 +440,9 @@
#endif /* USE_GNOME */
struct option long_options[] = {
{"acct", no_argument, NULL, 'a'},
- /*{"away", optional_argument, NULL, 'w'},*/
+ /*{"away", optional_argument, NULL, 'w'}, */
{"help", no_argument, NULL, 'h'},
- /*{"login", optional_argument, NULL, 'l'},*/
+ /*{"login", optional_argument, NULL, 'l'}, */
{"user", required_argument, NULL, 'u'},
{"file", required_argument, NULL, 'f'},
{"version", no_argument, NULL, 'v'},
@@ -478,8 +479,8 @@
if ((equals = strchr(argv[i], '=')) != NULL) {
/* --login=NAME */
opt_login_arg = g_strdup(equals + 1);
- if (strlen (opt_login_arg) == 0) {
- g_free (opt_login_arg);
+ if (strlen(opt_login_arg) == 0) {
+ g_free(opt_login_arg);
opt_login_arg = NULL;
}
} else if (i + 1 < argc && argv[i + 1][0] != '-') {
@@ -503,44 +504,44 @@
strcpy(argv[i], " ");
}
/* --away option */
- else if (strstr (argv[i], "--aw") == argv[i]) {
+ else if (strstr(argv[i], "--aw") == argv[i]) {
char *equals;
opt_away = 1;
if ((equals = strchr(argv[i], '=')) != NULL) {
/* --away=MESG */
- opt_away_arg = g_strdup (equals+1);
- if (strlen (opt_away_arg) == 0) {
- g_free (opt_away_arg);
+ opt_away_arg = g_strdup(equals + 1);
+ if (strlen(opt_away_arg) == 0) {
+ g_free(opt_away_arg);
opt_away_arg = NULL;
}
- } else if (i+1 < argc && argv[i+1][0] != '-') {
+ } else if (i + 1 < argc && argv[i + 1][0] != '-') {
/* --away MESG */
- opt_away_arg = g_strdup (argv[i+1]);
- strcpy (argv[i+1], " ");
+ opt_away_arg = g_strdup(argv[i + 1]);
+ strcpy(argv[i + 1], " ");
}
- strcpy (argv[i], " ");
+ strcpy(argv[i], " ");
}
/* -w option */
- else if (strstr (argv[i], "-w") == argv[i]) {
+ else if (strstr(argv[i], "-w") == argv[i]) {
opt_away = 1;
- if (strlen (argv[i]) > 2) {
+ if (strlen(argv[i]) > 2) {
/* -wMESG */
- opt_away_arg = g_strdup (argv[i]+2);
- } else if (i+1 < argc && argv[i+1][0] != '-') {
+ opt_away_arg = g_strdup(argv[i] + 2);
+ } else if (i + 1 < argc && argv[i + 1][0] != '-') {
/* -w MESG */
- opt_away_arg = g_strdup (argv[i+1]);
- strcpy (argv[i+1], " ");
+ opt_away_arg = g_strdup(argv[i + 1]);
+ strcpy(argv[i + 1], " ");
}
strcpy(argv[i], " ");
}
}
/*
- if (opt_login) {
- printf ("--login given with arg %s\n",
- opt_login_arg ? opt_login_arg : "NULL");
- exit(0);
- }
- */
+ if (opt_login) {
+ printf ("--login given with arg %s\n",
+ opt_login_arg ? opt_login_arg : "NULL");
+ exit(0);
+ }
+ */
gtk_set_locale();
#ifdef USE_GNOME
@@ -555,8 +556,7 @@
#else
opterr = 1;
#endif
- while ((opt = getopt_long(argc, argv, "ahu:f:v",
- long_options, NULL)) != -1) {
+ while ((opt = getopt_long(argc, argv, "ahu:f:v", long_options, NULL)) != -1) {
switch (opt) {
case 'u': /* set user */
opt_user = 1;
@@ -566,7 +566,7 @@
opt_acct = 1;
break;
case 'f':
- opt_rcfile_arg = g_strdup (optarg);
+ opt_rcfile_arg = g_strdup(optarg);
break;
case 'v': /* version */
opt_version = 1;
@@ -629,7 +629,6 @@
opt_login_arg = NULL;
}
}
-
#ifdef USE_APPLET
applet_widget_register_callback(APPLET_WIDGET(applet),
"prefs", _("Preferences"), show_prefs, NULL);
Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- applet.c 2001/09/20 01:43:09 1.12
+++ applet.c 2001/09/27 19:17:10 1.13
@@ -45,49 +45,48 @@
GtkWidget *appletframe;
GtkWidget *icon;
-GdkPixmap *icon_offline_pm=NULL;
-GdkPixmap *icon_offline_bm=NULL;
+GdkPixmap *icon_offline_pm = NULL;
+GdkPixmap *icon_offline_bm = NULL;
-GdkPixmap *icon_online_pm=NULL;
-GdkPixmap *icon_online_bm=NULL;
+GdkPixmap *icon_online_pm = NULL;
+GdkPixmap *icon_online_bm = NULL;
-GdkPixmap *icon_connect_pm=NULL;
-GdkPixmap *icon_connect_bm=NULL;
+GdkPixmap *icon_connect_pm = NULL;
+GdkPixmap *icon_connect_bm = NULL;
-GdkPixmap *icon_msg_pending_pm=NULL;
-GdkPixmap *icon_msg_pending_bm=NULL;
+GdkPixmap *icon_msg_pending_pm = NULL;
+GdkPixmap *icon_msg_pending_bm = NULL;
-GdkPixmap *icon_away_pm=NULL;
-GdkPixmap *icon_away_bm=NULL;
+GdkPixmap *icon_away_pm = NULL;
+GdkPixmap *icon_away_bm = NULL;
static GtkAllocation get_applet_pos(gboolean);
-gint sizehint=48;
+gint sizehint = 48;
-static gboolean load_applet_icon(const char *name, int height, int width,
- GdkPixmap **pm, GdkBitmap **bm)
+static gboolean load_applet_icon(const char *name, int height, int width, GdkPixmap **pm, GdkBitmap **bm)
{
gboolean result = TRUE;
char *path;
GdkImlibImage *im;
- path = gnome_pixmap_file(name);
+ path = gnome_pixmap_file(name);
- im=gdk_imlib_load_image( path );
-
- if ((*pm)!=NULL)
+ im = gdk_imlib_load_image(path);
+
+ if ((*pm) != NULL)
gdk_imlib_free_pixmap((*pm));
-
- if( im!= NULL ){
- gdk_imlib_render(im,width,height);
-
+
+ if (im != NULL) {
+ gdk_imlib_render(im, width, height);
+
(*pm) = gdk_imlib_move_image(im);
- (*bm) = gdk_imlib_move_mask(im);
-
+ (*bm) = gdk_imlib_move_mask(im);
+
} else {
result = FALSE;
- debug_printf(_("file not found: %s\n"),path);
+ debug_printf(_("file not found: %s\n"), path);
}
-
+
free(path);
return result;
}
@@ -100,80 +99,75 @@
}
#endif
-static gboolean update_applet(){
+static gboolean update_applet()
+{
char buf[BUF_LONG];
GSList *c = connections;
if (connecting) {
- gtk_pixmap_set( GTK_PIXMAP(icon),
- icon_connect_pm,
- icon_connect_bm );
+ gtk_pixmap_set(GTK_PIXMAP(icon), icon_connect_pm, icon_connect_bm);
applet_set_tooltips(_("Attempting to sign on...."));
} else if (!connections) {
- gtk_pixmap_set( GTK_PIXMAP(icon),
- icon_offline_pm,
- icon_offline_bm );
+ gtk_pixmap_set(GTK_PIXMAP(icon), icon_offline_pm, icon_offline_bm);
applet_set_tooltips(_("Offline. Click to bring up login box."));
} else if (!awaymessage) {
- gtk_pixmap_set( GTK_PIXMAP(icon),
- icon_online_pm,
- icon_online_bm );
+ gtk_pixmap_set(GTK_PIXMAP(icon), icon_online_pm, icon_online_bm);
g_snprintf(buf, sizeof buf, "Online: ");
while (c) {
strcat(buf, ((struct gaim_connection *)c->data)->username);
c = g_slist_next(c);
- if (c) strcat(buf, ", ");
+ if (c)
+ strcat(buf, ", ");
}
applet_set_tooltips(buf);
} else {
- gtk_pixmap_set( GTK_PIXMAP(icon),
- icon_online_pm,
- icon_online_bm );
+ gtk_pixmap_set(GTK_PIXMAP(icon), icon_online_pm, icon_online_bm);
}
return TRUE;
}
-void update_pixmaps() {
- load_applet_icon( GAIM_GNOME_OFFLINE_ICON, (sizehint-1), (sizehint-1),
- &icon_offline_pm, &icon_offline_bm );
- load_applet_icon( GAIM_GNOME_CONNECT_ICON, (sizehint-1), (sizehint-1),
- &icon_connect_pm, &icon_connect_bm );
- load_applet_icon( GAIM_GNOME_ONLINE_ICON, (sizehint-1), (sizehint-1),
- &icon_online_pm, &icon_online_bm );
+void update_pixmaps()
+{
+ load_applet_icon(GAIM_GNOME_OFFLINE_ICON, (sizehint - 1), (sizehint - 1),
+ &icon_offline_pm, &icon_offline_bm);
+ load_applet_icon(GAIM_GNOME_CONNECT_ICON, (sizehint - 1), (sizehint - 1),
+ &icon_connect_pm, &icon_connect_bm);
+ load_applet_icon(GAIM_GNOME_ONLINE_ICON, (sizehint - 1), (sizehint - 1),
+ &icon_online_pm, &icon_online_bm);
update_applet();
gtk_widget_set_usize(appletframe, sizehint, sizehint);
}
extern GtkWidget *mainwindow;
-void applet_show_login(AppletWidget *widget, gpointer data) {
- show_login();
+void applet_show_login(AppletWidget *widget, gpointer data)
+{
+ show_login();
if (blist_options & OPT_BLIST_NEAR_APPLET) {
GtkAllocation a = get_applet_pos(FALSE);
gtk_widget_set_uposition(mainwindow, a.x, a.y);
}
}
-void applet_do_signon(AppletWidget *widget, gpointer data) {
+void applet_do_signon(AppletWidget *widget, gpointer data)
+{
applet_show_login(NULL, 0);
}
-void insert_applet_away() {
+void insert_applet_away()
+{
GSList *awy = away_messages;
struct away_message *a;
- char *awayname;
+ char *awayname;
- applet_widget_register_callback_dir(APPLET_WIDGET(applet),
- "away/",
- _("Away"));
+ applet_widget_register_callback_dir(APPLET_WIDGET(applet), "away/", _("Away"));
applet_widget_register_callback(APPLET_WIDGET(applet),
- "away/new",
- _("New Away Message"),
- (AppletCallbackFunc)create_away_mess,
- NULL);
+ "away/new",
+ _("New Away Message"),
+ (AppletCallbackFunc)create_away_mess, NULL);
- while(awy) {
+ while (awy) {
a = (struct away_message *)awy->data;
awayname = g_malloc(sizeof *awayname * (6 + strlen(a->name)));
@@ -181,20 +175,19 @@
strcat(awayname, "away/");
strcat(awayname, a->name);
applet_widget_register_callback(APPLET_WIDGET(applet),
- awayname,
- a->name,
- (AppletCallbackFunc)do_away_message,
- a);
+ awayname,
+ a->name, (AppletCallbackFunc)do_away_message, a);
awy = g_slist_next(awy);
g_free(awayname);
}
}
-void remove_applet_away() {
+void remove_applet_away()
+{
GSList *awy = away_messages;
struct away_message *a;
- char *awayname;
+ char *awayname;
if (!applet)
return;
@@ -217,16 +210,17 @@
applet_widget_unregister_callback(APPLET_WIDGET(applet), "away");
}
-static GtkAllocation get_applet_pos(gboolean for_blist) {
- gint x,y,pad;
+static GtkAllocation get_applet_pos(gboolean for_blist)
+{
+ gint x, y, pad;
GtkRequisition buddy_req, applet_req;
GtkAllocation result;
- GNOME_Panel_OrientType orient = applet_widget_get_panel_orient( APPLET_WIDGET(applet) );
+ GNOME_Panel_OrientType orient = applet_widget_get_panel_orient(APPLET_WIDGET(applet));
pad = 5;
gdk_window_get_position(gtk_widget_get_parent_window(appletframe), &x, &y);
if (for_blist) {
- if (blist_options & OPT_BLIST_SAVED_WINDOWS) {
+ if (blist_options & OPT_BLIST_SAVED_WINDOWS) {
buddy_req.width = blist_pos.width;
buddy_req.height = blist_pos.height;
} else {
@@ -238,42 +232,46 @@
applet_req = appletframe->requisition;
/* FIXME : we need to be smarter here */
- switch( orient ){
+ switch (orient) {
case ORIENT_UP:
- result.x=x;
- result.y=y-(buddy_req.height+pad);
+ result.x = x;
+ result.y = y - (buddy_req.height + pad);
break;
case ORIENT_DOWN:
- result.x=x;
- result.y=y+applet_req.height+pad;
+ result.x = x;
+ result.y = y + applet_req.height + pad;
break;
case ORIENT_LEFT:
- result.x=x-(buddy_req.width + pad );
- result.y=y;
+ result.x = x - (buddy_req.width + pad);
+ result.y = y;
break;
case ORIENT_RIGHT:
- result.x=x+applet_req.width+pad;
- result.y=y;
+ result.x = x + applet_req.width + pad;
+ result.y = y;
break;
- }
+ }
return result;
}
-void createOnlinePopup(){
+void createOnlinePopup()
+{
GtkAllocation al;
- if (blist) gtk_widget_show(blist);
- al = get_applet_pos(TRUE);
- if (blist_options & OPT_BLIST_NEAR_APPLET)
- gtk_widget_set_uposition ( blist, al.x, al.y );
- else if (blist_options & OPT_BLIST_SAVED_WINDOWS)
- gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff, blist_pos.y - blist_pos.yoff);
+ if (blist)
+ gtk_widget_show(blist);
+ al = get_applet_pos(TRUE);
+ if (blist_options & OPT_BLIST_NEAR_APPLET)
+ gtk_widget_set_uposition(blist, al.x, al.y);
+ else if (blist_options & OPT_BLIST_SAVED_WINDOWS)
+ gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff,
+ blist_pos.y - blist_pos.yoff);
}
-void AppletClicked( GtkWidget *sender, GdkEventButton *ev, gpointer data ){
+void AppletClicked(GtkWidget *sender, GdkEventButton *ev, gpointer data)
+{
if (!ev || ev->button != 1 || ev->type != GDK_BUTTON_PRESS)
return;
-
- if(applet_buddy_show) {
+
+ if (applet_buddy_show) {
applet_buddy_show = FALSE;
if (!connections && mainwindow)
gtk_widget_hide(mainwindow);
@@ -282,7 +280,7 @@
} else {
applet_buddy_show = TRUE;
if (!connections)
- applet_show_login( APPLET_WIDGET(applet), NULL );
+ applet_show_login(APPLET_WIDGET(applet), NULL);
else
createOnlinePopup();
}
@@ -295,79 +293,77 @@
**
****************************************************************/
-gint init_applet_mgr(int argc, char *argv[]) {
+gint init_applet_mgr(int argc, char *argv[])
+{
GtkWidget *vbox;
-
- applet_widget_init("GAIM",VERSION,argc,argv,NULL,0,NULL);
-
- /*init imlib for graphics*/
- gdk_imlib_init();
- gtk_widget_push_visual(gdk_imlib_get_visual());
- gtk_widget_push_colormap(gdk_imlib_get_colormap());
- applet=applet_widget_new("gaim_applet");
- if(!applet) g_error(_("Can't create GAIM applet!"));
- gtk_widget_set_events(applet, gtk_widget_get_events(applet) |
- GDK_BUTTON_PRESS_MASK);
+ applet_widget_init("GAIM", VERSION, argc, argv, NULL, 0, NULL);
- appletframe = gtk_frame_new(NULL);
+ /*init imlib for graphics */
+ gdk_imlib_init();
+ gtk_widget_push_visual(gdk_imlib_get_visual());
+ gtk_widget_push_colormap(gdk_imlib_get_colormap());
+
+ applet = applet_widget_new("gaim_applet");
+ if (!applet)
+ g_error(_("Can't create GAIM applet!"));
+ gtk_widget_set_events(applet, gtk_widget_get_events(applet) | GDK_BUTTON_PRESS_MASK);
+
+ appletframe = gtk_frame_new(NULL);
gtk_frame_set_shadow_type(GTK_FRAME(appletframe), GTK_SHADOW_NONE);
#ifdef HAVE_PANEL_PIXEL_SIZE
gtk_widget_set_usize(appletframe, 5, 5);
#else
- gtk_widget_set_usize(appletframe, 48, 48);
-#endif
-
- /*load offline icon*/
- load_applet_icon( GAIM_GNOME_OFFLINE_ICON, 32, 32,
- &icon_offline_pm, &icon_offline_bm );
-
- /*load connecting icon*/
- load_applet_icon( GAIM_GNOME_CONNECT_ICON, 32, 32,
- &icon_connect_pm, &icon_connect_bm );
-
- /*load online icon*/
- load_applet_icon( GAIM_GNOME_ONLINE_ICON, 32, 32,
- &icon_online_pm, &icon_online_bm );
-
- /*icon_away and icon_msg_pennding need to be implemented*/
-
- icon=gtk_pixmap_new(icon_offline_pm,icon_offline_bm);
-
- vbox = gtk_vbox_new(FALSE,0);
-
+ gtk_widget_set_usize(appletframe, 48, 48);
+#endif
+
+ /*load offline icon */
+ load_applet_icon(GAIM_GNOME_OFFLINE_ICON, 32, 32, &icon_offline_pm, &icon_offline_bm);
+
+ /*load connecting icon */
+ load_applet_icon(GAIM_GNOME_CONNECT_ICON, 32, 32, &icon_connect_pm, &icon_connect_bm);
+
+ /*load online icon */
+ load_applet_icon(GAIM_GNOME_ONLINE_ICON, 32, 32, &icon_online_pm, &icon_online_bm);
+
+ /*icon_away and icon_msg_pennding need to be implemented */
+
+ icon = gtk_pixmap_new(icon_offline_pm, icon_offline_bm);
+
+ vbox = gtk_vbox_new(FALSE, 0);
+
gtk_box_pack_start(GTK_BOX(vbox), icon, FALSE, TRUE, 0);
-
+
update_applet();
-
- gtk_container_add( GTK_CONTAINER(appletframe), vbox );
+
+ gtk_container_add(GTK_CONTAINER(appletframe), vbox);
applet_widget_add(APPLET_WIDGET(applet), appletframe);
-
- gtk_widget_show( vbox );
- gtk_widget_show( appletframe );
-
+
+ gtk_widget_show(vbox);
+ gtk_widget_show(appletframe);
+
applet_widget_register_stock_callback(APPLET_WIDGET(applet),
"about",
GNOME_STOCK_MENU_ABOUT,
- _("About..."),
- (AppletCallbackFunc)show_about,
- NULL);
-
- gtk_signal_connect( GTK_OBJECT(applet), "button_press_event", GTK_SIGNAL_FUNC( AppletClicked), NULL);
+ _("About..."), (AppletCallbackFunc)show_about, NULL);
- gtk_signal_connect( GTK_OBJECT(applet), "destroy", GTK_SIGNAL_FUNC( do_quit), NULL);
+ gtk_signal_connect(GTK_OBJECT(applet), "button_press_event", GTK_SIGNAL_FUNC(AppletClicked),
+ NULL);
+
+ gtk_signal_connect(GTK_OBJECT(applet), "destroy", GTK_SIGNAL_FUNC(do_quit), NULL);
#ifdef HAVE_PANEL_PIXEL_SIZE
gtk_signal_connect(GTK_OBJECT(applet), "change_pixel_size",
- GTK_SIGNAL_FUNC(applet_change_pixel_size), NULL);
+ GTK_SIGNAL_FUNC(applet_change_pixel_size), NULL);
#endif
-
- gtk_widget_show(icon);
- gtk_widget_show(applet);
- return 0;
+
+ gtk_widget_show(icon);
+ gtk_widget_show(applet);
+ return 0;
}
-void set_user_state( enum gaim_user_states state ){
+void set_user_state(enum gaim_user_states state)
+{
if (state == signing_on)
connecting++;
else if ((state == away || state == online) && connecting > 0)
@@ -375,10 +371,11 @@
update_applet();
}
-void applet_set_tooltips(char *msg) {
+void applet_set_tooltips(char *msg)
+{
if (!applet)
return;
applet_widget_set_tooltip(APPLET_WIDGET(applet), msg);
}
-#endif /*USE_APPLET*/
+#endif /*USE_APPLET */
Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- away.c 2001/09/20 01:20:29 1.60
+++ away.c 2001/09/27 19:17:10 1.61
@@ -89,7 +89,7 @@
{
if (!clistqueue || !clistqueuesw)
return;
-
+
if (away_options & OPT_AWAY_QUEUE) {
gtk_widget_show(clistqueue);
gtk_widget_show(clistqueuesw);
@@ -148,7 +148,7 @@
imaway = gtk_window_new(GTK_WINDOW_DIALOG);
gtk_window_set_wmclass(GTK_WINDOW(imaway), "imaway", "Gaim");
if (strlen(a->name))
- gtk_window_set_title(GTK_WINDOW(imaway), a->name);
+ gtk_window_set_title(GTK_WINDOW(imaway), a->name);
else
gtk_window_set_title(GTK_WINDOW(imaway), _("Gaim - Away!"));
gtk_signal_connect(GTK_OBJECT(imaway), "destroy", GTK_SIGNAL_FUNC(do_im_back), imaway);
@@ -161,7 +161,8 @@
gtk_widget_show(vbox);
sw = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER,
+ GTK_POLICY_ALWAYS);
gtk_widget_set_usize(sw, 245, 120);
gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
gtk_widget_show(sw);
@@ -172,15 +173,14 @@
gtk_widget_show(awaytext);
buf = stylize(a->message, BUF_LONG);
gtk_imhtml_append_text(GTK_IMHTML(awaytext), buf, GTK_IMHTML_NO_TITLE |
- GTK_IMHTML_NO_COMMENTS |
- GTK_IMHTML_NO_SCROLL);
+ GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL);
g_free(buf);
gtk_imhtml_append_text(GTK_IMHTML(awaytext), "<BR>", GTK_IMHTML_NO_TITLE |
- GTK_IMHTML_NO_COMMENTS |
- GTK_IMHTML_NO_SCROLL);
+ GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL);
clistqueuesw = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clistqueuesw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clistqueuesw), GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(vbox), clistqueuesw, TRUE, TRUE, 0);
clistqueue = gtk_clist_new(2);
@@ -301,7 +301,8 @@
a = (struct away_message *)awy->data;
list_item = gtk_list_item_new();
gtk_container_add(GTK_CONTAINER(prefs_away_list), list_item);
- gtk_signal_connect(GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(away_list_clicked), a);
+ gtk_signal_connect(GTK_OBJECT(list_item), "select",
+ GTK_SIGNAL_FUNC(away_list_clicked), a);
gtk_object_set_user_data(GTK_OBJECT(list_item), a);
gtk_widget_show(list_item);
@@ -366,7 +367,7 @@
while (con) {
gc = con->data;
- if (gc->prpl->away_states && gc->prpl->set_away)
+ if (gc->prpl->away_states &&gc->prpl->set_away)
count++;
con = g_slist_next(con);
}
@@ -377,7 +378,7 @@
GList *msgs, *tmp;
while (con) {
gc = con->data;
- if (gc->prpl->away_states && gc->prpl->set_away)
+ if (gc->prpl->away_states &&gc->prpl->set_away)
break;
con = g_slist_next(con);
}
@@ -399,37 +400,42 @@
awy = g_slist_next(awy);
}
- } else while (msgs) {
- awy = away_messages;
+ } else
+ while (msgs) {
+ awy = away_messages;
- menuitem = gtk_menu_item_new_with_label(msgs->data);
- gtk_object_set_user_data(GTK_OBJECT(menuitem), msgs->data);
- gtk_menu_append(GTK_MENU(awaymenu), menuitem);
- gtk_widget_show(menuitem);
+ menuitem = gtk_menu_item_new_with_label(msgs->data);
+ gtk_object_set_user_data(GTK_OBJECT(menuitem), msgs->data);
+ gtk_menu_append(GTK_MENU(awaymenu), menuitem);
+ gtk_widget_show(menuitem);
- if (strcmp(msgs->data, GAIM_AWAY_CUSTOM)) {
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(set_gc_state), gc);
- } else {
- submenu = gtk_menu_new();
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
- gtk_widget_show(submenu);
+ if (strcmp(msgs->data, GAIM_AWAY_CUSTOM)) {
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+ GTK_SIGNAL_FUNC(set_gc_state), gc);
+ } else {
+ submenu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),
+ submenu);
+ gtk_widget_show(submenu);
- while (awy) {
- a = (struct away_message *)awy->data;
+ while (awy) {
+ a = (struct away_message *)awy->data;
- menuitem = gtk_menu_item_new_with_label(a->name);
- gtk_object_set_user_data(GTK_OBJECT(menuitem), a);
- gtk_menu_append(GTK_MENU(submenu), menuitem);
- gtk_widget_show(menuitem);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(do_away_message), a);
+ menuitem = gtk_menu_item_new_with_label(a->name);
+ gtk_object_set_user_data(GTK_OBJECT(menuitem),
+ a);
+ gtk_menu_append(GTK_MENU(submenu), menuitem);
+ gtk_widget_show(menuitem);
+ gtk_signal_connect(GTK_OBJECT(menuitem),
+ "activate",
+ GTK_SIGNAL_FUNC
+ (do_away_message), a);
- awy = g_slist_next(awy);
+ awy = g_slist_next(awy);
+ }
}
+ msgs = g_list_next(msgs);
}
- msgs = g_list_next(msgs);
- }
g_list_free(tmp);
} else {
@@ -438,7 +444,7 @@
GList *msgs, *tmp;
gc = con->data;
- if (!gc->prpl->away_states || !gc->prpl->set_away) {
+ if (!gc->prpl->away_states ||!gc->prpl->set_away) {
con = con->next;
continue;
}
@@ -456,7 +462,7 @@
tmp = msgs = (*gc->prpl->away_states)();
if ((g_list_length(msgs) == 1) &&
- (!strcmp(msgs->data, GAIM_AWAY_CUSTOM))) {
+ (!strcmp(msgs->data, GAIM_AWAY_CUSTOM))) {
menuitem = gtk_menu_item_new_with_label(_("Back"));
gtk_menu_append(GTK_MENU(submenu), menuitem);
gtk_widget_show(menuitem);
@@ -485,41 +491,48 @@
awy = g_slist_next(awy);
}
- } else while (msgs) {
- awy = away_messages;
-
- menuitem = gtk_menu_item_new_with_label(msgs->data);
- gtk_object_set_user_data(GTK_OBJECT(menuitem), msgs->data);
- gtk_menu_append(GTK_MENU(submenu), menuitem);
- gtk_widget_show(menuitem);
-
- if (strcmp(msgs->data, GAIM_AWAY_CUSTOM)) {
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(set_gc_state), gc);
- } else {
- submenu2 = gtk_menu_new();
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem),
- submenu2);
- gtk_widget_show(submenu2);
+ } else
+ while (msgs) {
+ awy = away_messages;
- while (awy) {
- a = (struct away_message *)awy->data;
+ menuitem = gtk_menu_item_new_with_label(msgs->data);
+ gtk_object_set_user_data(GTK_OBJECT(menuitem),
+ msgs->data);
+ gtk_menu_append(GTK_MENU(submenu), menuitem);
+ gtk_widget_show(menuitem);
- menuitem = gtk_menu_item_new_with_label(a->name);
- gtk_object_set_user_data(GTK_OBJECT(menuitem),
- a);
- gtk_menu_append(GTK_MENU(submenu2), menuitem);
- gtk_widget_show(menuitem);
+ if (strcmp(msgs->data, GAIM_AWAY_CUSTOM)) {
gtk_signal_connect(GTK_OBJECT(menuitem),
"activate",
- GTK_SIGNAL_FUNC(set_gc_away),
+ GTK_SIGNAL_FUNC(set_gc_state),
gc);
+ } else {
+ submenu2 = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM
+ (menuitem), submenu2);
+ gtk_widget_show(submenu2);
- awy = g_slist_next(awy);
+ while (awy) {
+ a = (struct away_message *)awy->data;
+
+ menuitem =
+ gtk_menu_item_new_with_label(a->
+ name);
+ gtk_object_set_user_data(GTK_OBJECT
+ (menuitem), a);
+ gtk_menu_append(GTK_MENU(submenu2),
+ menuitem);
+ gtk_widget_show(menuitem);
+ gtk_signal_connect(GTK_OBJECT(menuitem),
+ "activate",
+ GTK_SIGNAL_FUNC
+ (set_gc_away), gc);
+
+ awy = g_slist_next(awy);
+ }
}
+ msgs = g_list_next(msgs);
}
- msgs = g_list_next(msgs);
- }
g_list_free(tmp);
Index: browser.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/browser.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- browser.c 2001/08/01 18:33:25 1.13
+++ browser.c 2001/09/27 19:17:10 1.14
@@ -97,7 +97,8 @@
__SWM_VROOT, 0, 1, False, XA_WINDOW,
&actual_type, &actual_format,
&nitems, &bytesafter,
- (unsigned char **)&newRoot) == Success && newRoot) {
+ (unsigned char **)&newRoot) == Success
+ && newRoot) {
root = *newRoot;
break;
}
@@ -460,11 +461,10 @@
if (data)
g_free(data);
- }
- else if (event->type == GDK_PROPERTY_NOTIFY &&
- event->property.window == window &&
- event->property.state == GDK_PROPERTY_DELETE &&
- event->property.atom == XA_MOZILLA_COMMAND) {
+ } else if (event->type == GDK_PROPERTY_NOTIFY &&
+ event->property.window == window &&
+ event->property.state == GDK_PROPERTY_DELETE &&
+ event->property.atom == XA_MOZILLA_COMMAND) {
debug_printf("%s: (server 0x%x has accepted "
MOZILLA_COMMAND_PROP ".)\n", progname, (unsigned int)window);
}
@@ -609,7 +609,8 @@
g_snprintf(command, sizeof(command), web_command, url);
else if ((ms = strstr(web_command, "%s")) != NULL) {
*ms = 0;
- g_snprintf(command, sizeof(command), "%s\"%s\"%s", web_command, url, ms + 2);
+ g_snprintf(command, sizeof(command), "%s\"%s\"%s", web_command, url,
+ ms + 2);
}
args[0] = "sh";
@@ -667,4 +668,4 @@
}
-#endif /* _WIN32 */
+#endif /* _WIN32 */
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- buddy.c 2001/09/21 00:14:11 1.244
+++ buddy.c 2001/09/27 19:17:10 1.245
@@ -88,8 +88,8 @@
GtkWidget *bpmenu;
GtkWidget *buddies;
-void BuddyTickerLogonTimeout( gpointer data );
-void BuddyTickerLogoutTimeout( gpointer data );
+void BuddyTickerLogonTimeout(gpointer data);
+void BuddyTickerLogoutTimeout(gpointer data);
/* Predefine some functions */
static void new_bp_callback(GtkWidget *w, char *name);
@@ -128,7 +128,8 @@
[...2003 lines suppressed...]
- break;
+ if (!g_strcasecmp(n, normalize (d->data)))
+ break;
d = d->next;
}
g_free(n);
@@ -2973,10 +3011,10 @@
char *n;
name = g_malloc(strlen(c + 2) + 2);
g_snprintf(name, strlen(c + 2) + 1, "%s", c + 2);
- n = g_strdup(normalize(name));
+ n = g_strdup(normalize (name));
while (d) {
- if (!g_strcasecmp(n, normalize(d->data)))
- break;
+ if (!g_strcasecmp(n, normalize (d->data)))
+ break;
d = d->next;
}
g_free(n);
Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- buddy_chat.c 2001/09/27 17:44:23 1.115
+++ buddy_chat.c 2001/09/27 19:17:10 1.116
@@ -319,7 +319,7 @@
GSList *bl;
struct group *g;
struct buddy *buddy;
-
+
static GList *tmp = NULL;
if (tmp)
@@ -343,7 +343,7 @@
tmp = g_list_append(tmp, buddy->name);
bl = g_slist_next(bl);
- }
+ }
grp = g_slist_next(grp);
}
@@ -362,7 +362,7 @@
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *frame;
-
+
if (!invite) {
invite = gtk_window_new(GTK_WINDOW_DIALOG);
gtk_widget_realize(invite);
@@ -373,14 +373,14 @@
invitemess = gtk_entry_new();
frame = gtk_frame_new(_("Invite"));
table = gtk_table_new(2, 2, FALSE);
-
+
gtk_table_set_row_spacings(GTK_TABLE(table), 5);
gtk_table_set_col_spacings(GTK_TABLE(table), 5);
gtk_container_set_border_width(GTK_CONTAINER(table), 5);
-
+
gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
-
- /* Now we should fill out all of the names */
+
+ /* Now we should fill out all of the names */
gtk_combo_set_popdown_strings(GTK_COMBO(inviteentry), generate_invite_user_names(b->gc));
vbox = gtk_vbox_new(FALSE, 0);
@@ -398,8 +398,10 @@
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
/* Now the right side of the table */
- gtk_table_attach(GTK_TABLE(table), inviteentry, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
- gtk_table_attach(GTK_TABLE(table), invitemess, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), inviteentry, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0,
+ 0);
+ gtk_table_attach(GTK_TABLE(table), invitemess, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0,
+ 0);
/* And now for the button box */
bbox = gtk_hbox_new(FALSE, 10);
@@ -414,7 +416,8 @@
gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_invite), b);
gtk_signal_connect(GTK_OBJECT(invite_btn), "clicked", GTK_SIGNAL_FUNC(do_invite), b);
- gtk_signal_connect(GTK_OBJECT(GTK_ENTRY(GTK_COMBO(inviteentry)->entry)), "activate", GTK_SIGNAL_FUNC(do_invite), b);
+ gtk_signal_connect(GTK_OBJECT(GTK_ENTRY(GTK_COMBO(inviteentry)->entry)), "activate",
+ GTK_SIGNAL_FUNC(do_invite), b);
/* Finish up */
gtk_widget_set_usize(GTK_WIDGET(invite), 550, 115);
@@ -484,12 +487,12 @@
if (!(flag & WFLAG_WHISPER)) {
- str = g_strdup(normalize(who));
- if (!g_strcasecmp(str, normalize(b->gc->username))) {
+ str = g_strdup(normalize (who));
+ if (!g_strcasecmp(str, normalize (b->gc->username))) {
if (b->makesound && (sound_options & OPT_SOUND_CHAT_YOU_SAY))
play_sound(CHAT_YOU_SAY);
flag |= WFLAG_SEND;
- } else if (!g_strcasecmp(str, normalize(b->gc->displayname))) {
+ } else if (!g_strcasecmp(str, normalize (b->gc->displayname))) {
if (b->makesound && (sound_options & OPT_SOUND_CHAT_YOU_SAY))
play_sound(CHAT_YOU_SAY);
flag |= WFLAG_SEND;
@@ -534,7 +537,7 @@
g_snprintf(buf2, sizeof(buf2), "%s->%s", b->gc->username, who);
- chat_write(b, buf2, WFLAG_WHISPER, buf, time((time_t)NULL));
+ chat_write(b, buf2, WFLAG_WHISPER, buf, time(NULL));
gtk_widget_grab_focus(GTK_WIDGET(b->entry));
@@ -642,7 +645,7 @@
ignored = b->ignored;
while (ignored) {
if (!g_strcasecmp(name, ignored->data))
- break;
+ break;
ignored = ignored->next;
}
@@ -658,7 +661,8 @@
gtk_list_insert_items(GTK_LIST(b->list), g_list_append(NULL, list_item), pos);
gtk_widget_show(list_item);
- g_snprintf(tmp, sizeof(tmp), _("%d %s in room"), g_list_length(b->in_room), g_list_length(b->in_room) == 1 ? "person" : "people");
+ g_snprintf(tmp, sizeof(tmp), _("%d %s in room"), g_list_length(b->in_room),
+ g_list_length(b->in_room) == 1 ? "person" : "people");
gtk_label_set_text(GTK_LABEL(b->count), tmp);
if (b->makesound && (sound_options & OPT_SOUND_CHAT_JOIN))
@@ -666,7 +670,7 @@
if (chat_options & OPT_CHAT_LOGON) {
g_snprintf(tmp, sizeof(tmp), _("%s entered the room."), name);
- write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time((time_t)NULL));
+ write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time(NULL));
}
}
@@ -729,7 +733,7 @@
if (chat_options & OPT_CHAT_LOGON) {
g_snprintf(tmp, sizeof(tmp), _("%s is now known as %s"), old, new);
- write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time((time_t)NULL));
+ write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time(NULL));
}
}
@@ -764,7 +768,8 @@
if (!names)
return;
- g_snprintf(tmp, sizeof(tmp), _("%d %s in room"), g_list_length(b->in_room), g_list_length(b->in_room) == 1 ? "person" : "people");
+ g_snprintf(tmp, sizeof(tmp), _("%d %s in room"), g_list_length(b->in_room),
+ g_list_length(b->in_room) == 1 ? "person" : "people");
gtk_label_set_text(GTK_LABEL(b->count), tmp);
if (b->makesound && (sound_options & OPT_SOUND_CHAT_PART))
@@ -772,7 +777,7 @@
if (chat_options & OPT_CHAT_LOGON) {
g_snprintf(tmp, sizeof(tmp), _("%s left the room."), buddy);
- write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time((time_t)NULL));
+ write_to_conv(b, tmp, WFLAG_SYSTEM, NULL, time(NULL));
}
}
@@ -784,10 +789,11 @@
struct conversation *c;
i = GTK_LIST(b->list)->selection;
- if (i)
+ if (i) {
name = (char *)gtk_object_get_user_data(GTK_OBJECT(i->data));
- else
+ } else {
return;
+ }
c = find_conversation(name);
@@ -809,17 +815,18 @@
char tmp[80];
i = GTK_LIST(b->list)->selection;
- if (i)
+ if (i) {
name = (char *)gtk_object_get_user_data(GTK_OBJECT(i->data));
- else
+ } else {
return;
+ }
pos = gtk_list_child_position(GTK_LIST(b->list), i->data);
ignored = b->ignored;
while (ignored) {
if (!g_strcasecmp(name, ignored->data))
- break;
+ break;
ignored = ignored->next;
}
@@ -852,7 +859,9 @@
static void chat_switch(GtkNotebook *notebook, GtkWidget *page, gint page_num, gpointer data)
{
GtkWidget *label = gtk_notebook_get_tab_label(GTK_NOTEBOOK(chat_notebook),
- gtk_notebook_get_nth_page(GTK_NOTEBOOK(chat_notebook), page_num));
+ gtk_notebook_get_nth_page(GTK_NOTEBOOK
+ (chat_notebook),
+ page_num));
GtkStyle *style;
struct conversation *b = g_list_nth_data(chats, page_num);
if (b && b->window && b->entry)
@@ -908,18 +917,18 @@
if (chat_options & OPT_CHAT_SIDE_TAB) {
if (chat_options & OPT_CHAT_BR_TAB) {
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook),
- GTK_POS_RIGHT);
+ GTK_POS_RIGHT);
} else {
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook),
- GTK_POS_LEFT);
+ GTK_POS_LEFT);
}
} else {
if (chat_options & OPT_CHAT_BR_TAB) {
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook),
- GTK_POS_BOTTOM);
+ GTK_POS_BOTTOM);
} else {
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook),
- GTK_POS_TOP);
+ GTK_POS_TOP);
}
}
gtk_notebook_set_scrollable(GTK_NOTEBOOK(chat_notebook), TRUE);
@@ -948,7 +957,7 @@
gtk_window_set_title(GTK_WINDOW(win), buf);
gtk_signal_connect(GTK_OBJECT(win), "destroy", GTK_SIGNAL_FUNC(close_callback), b);
- cont = gtk_vbox_new(FALSE,5);
+ cont = gtk_vbox_new(FALSE, 5);
gtk_container_add(GTK_CONTAINER(win), cont);
gtk_widget_show(cont);
}
@@ -1106,7 +1115,7 @@
gtk_widget_show(win);
}
-void chat_set_topic(struct conversation *b, char* who, char* topic)
+void chat_set_topic(struct conversation *b, char *who, char *topic)
{
gtk_entry_set_text(GTK_ENTRY(b->topic_text), topic);
if (b->topic)
@@ -1239,7 +1248,7 @@
gtk_widget_reparent(imhtml, c->sw);
c->text = imhtml;
gtk_signal_disconnect_by_func(GTK_OBJECT(win),
- GTK_SIGNAL_FUNC(close_callback), c);
+ GTK_SIGNAL_FUNC(close_callback), c);
gtk_widget_destroy(win);
if (c->topic)
@@ -1253,7 +1262,7 @@
while (ignored) {
if (!g_strcasecmp(name, ignored->data))
- break;
+ break;
ignored = ignored->next;
}
@@ -1267,7 +1276,7 @@
gtk_signal_connect(GTK_OBJECT(list_item), "button_press_event",
GTK_SIGNAL_FUNC(right_click_chat), c);
gtk_list_insert_items(GTK_LIST(c->list),
- g_list_append(NULL, list_item), pos);
+ g_list_append(NULL, list_item), pos);
gtk_widget_show(list_item);
r = r->next;
@@ -1302,7 +1311,7 @@
while (ignored) {
if (!g_strcasecmp(name, ignored->data))
- break;
+ break;
ignored = ignored->next;
}
@@ -1316,7 +1325,7 @@
gtk_signal_connect(GTK_OBJECT(list_item), "button_press_event",
GTK_SIGNAL_FUNC(right_click_chat), c);
gtk_list_insert_items(GTK_LIST(c->list),
- g_list_append(NULL, list_item), pos);
+ g_list_append(NULL, list_item), pos);
gtk_widget_show(list_item);
r = r->next;
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- conversation.c 2001/09/26 19:48:50 1.264
+++ conversation.c 2001/09/27 19:17:10 1.265
@@ -427,7 +427,7 @@
if (im_options & OPT_IM_ONE_WINDOW) {
if (g_list_length(conversations) > 1) {
gtk_notebook_remove_page(GTK_NOTEBOOK(convo_notebook),
- g_list_index(conversations, c));
+ g_list_index(conversations, c));
} else {
if (c->window)
gtk_widget_destroy(c->window);
@@ -444,7 +444,7 @@
if (chat_options & OPT_CHAT_ONE_WINDOW) {
if (g_list_length(chats) > 1) {
gtk_notebook_remove_page(GTK_NOTEBOOK(chat_notebook),
- g_list_index(chats, c));
+ g_list_index(chats, c));
} else {
if (c->window)
gtk_widget_destroy(c->window);
@@ -522,7 +522,7 @@
return FALSE;
}
-static gint delete_event_convo(GtkWidget *w, GdkEventAny * e, struct conversation *c)
+static gint delete_event_convo(GtkWidget *w, GdkEventAny *e, struct conversation *c)
{
delete_conversation(c);
return FALSE;
@@ -566,10 +566,11 @@
GList *i;
i = GTK_LIST(c->list)->selection;
- if (i)
+ if (i) {
name = (char *)gtk_object_get_user_data(GTK_OBJECT(i->data));
- else
+ } else {
return;
+ }
serv_get_info(c->gc, name);
} else {
@@ -707,7 +708,7 @@
if (event->keyval == 'l')
gtk_imhtml_clear(GTK_IMHTML(c->text));
if ((!c->is_chat && (im_options & OPT_IM_ONE_WINDOW)) ||
- ( c->is_chat && (chat_options & OPT_CHAT_ONE_WINDOW))) {
+ (c->is_chat && (chat_options & OPT_CHAT_ONE_WINDOW))) {
GtkWidget *notebook = (c->is_chat ? chat_notebook : convo_notebook);
if (event->keyval == '[') {
gtk_notebook_prev_page(GTK_NOTEBOOK(notebook));
@@ -718,8 +719,8 @@
} else if (event->keyval == GDK_Tab) {
GList *ws = (c->is_chat ? chats : conversations);
GList *cnv = g_list_nth(ws,
- gtk_notebook_get_current_page(
- GTK_NOTEBOOK(notebook)));
+ gtk_notebook_get_current_page(GTK_NOTEBOOK
+ (notebook)));
struct conversation *d = NULL;
while (cnv) {
d = cnv->data;
@@ -730,7 +731,7 @@
}
if (d) {
gtk_notebook_set_page(GTK_NOTEBOOK(notebook),
- g_list_index(ws, d));
+ g_list_index(ws, d));
} else {
cnv = ws;
while (cnv) {
@@ -741,26 +742,22 @@
d = NULL;
}
if (d) {
- gtk_notebook_set_page(
- GTK_NOTEBOOK(notebook),
- g_list_index(ws, d));
+ gtk_notebook_set_page(GTK_NOTEBOOK(notebook),
+ g_list_index(ws, d));
} else {
cnv = g_list_last(ws);
if (c == cnv->data)
- gtk_notebook_set_page(
- GTK_NOTEBOOK(notebook), 0);
+ gtk_notebook_set_page(GTK_NOTEBOOK(notebook), 0);
else
- gtk_notebook_next_page(
- GTK_NOTEBOOK(notebook));
+ gtk_notebook_next_page(GTK_NOTEBOOK(notebook));
}
}
gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
}
}
} else if (((!c->is_chat && (im_options & OPT_IM_ONE_WINDOW)) ||
- ( c->is_chat && (chat_options & OPT_CHAT_ONE_WINDOW))) &&
- (event->state & GDK_MOD1_MASK) && isdigit(event->keyval) &&
- (event->keyval > '0')) {
+ (c->is_chat && (chat_options & OPT_CHAT_ONE_WINDOW))) &&
+ (event->state & GDK_MOD1_MASK) && isdigit(event->keyval) && (event->keyval > '0')) {
GtkWidget *notebook = (c->is_chat ? chat_notebook : convo_notebook);
gtk_notebook_set_page(GTK_NOTEBOOK(notebook), event->keyval - '1');
gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
@@ -780,7 +777,7 @@
return;
buf2 = gtk_editable_get_chars(GTK_EDITABLE(c->entry), 0, -1);
- limit = 32 * 1024; /* you shouldn't be sending more than 32k in your messages. that's a book. */
+ limit = 32 * 1024; /* you shouldn't be sending more than 32k in your messages. that's a book. */
buf = g_malloc(limit);
g_snprintf(buf, limit, "%s", buf2);
g_free(buf2);
@@ -832,8 +829,8 @@
}
if ((font_options & OPT_FONT_BGCOL) || c->hasbg) {
- g_snprintf(buf2, limit, "<BODY BGCOLOR=\"#%02X%02X%02X\">%s</BODY>", c->bgcol.red,
- c->bgcol.green, c->bgcol.blue, buf);
+ g_snprintf(buf2, limit, "<BODY BGCOLOR=\"#%02X%02X%02X\">%s</BODY>",
+ c->bgcol.red, c->bgcol.green, c->bgcol.blue, buf);
strcpy(buf, buf2);
}
}
@@ -852,8 +849,8 @@
char *buffy = g_strdup(buf);
enum gaim_event evnt = c->is_chat ? event_chat_send : event_im_send;
int plugin_return = plugin_event(evnt, c->gc,
- c->is_chat ? (void *)c->id : c->name,
- &buffy, 0);
+ c->is_chat ? (void *)c->id : c->name,
+ &buffy, 0);
if (!buffy) {
g_free(buf2);
g_free(buf);
@@ -885,7 +882,7 @@
if (err > 0) {
- write_to_conv(c, buf, WFLAG_SEND, NULL, time((time_t)NULL));
+ write_to_conv(c, buf, WFLAG_SEND, NULL, time(NULL));
if (c->makesound && (sound_options & OPT_SOUND_SEND))
play_sound(SEND);
@@ -1359,7 +1356,7 @@
if (flags & WFLAG_SEND) {
b = find_buddy(c->gc, c->gc->username);
if (b && strcmp(b->name, b->show))
- who = b->show;
+ who = b->show;
else if (c->gc->displayname[0])
who = c->gc->displayname;
else
@@ -1378,14 +1375,14 @@
}
}
-
+
if (flags & WFLAG_SYSTEM) {
if (convo_options & OPT_CONVO_SHOW_TIME)
g_snprintf(buf, BUF_LONG, "<FONT SIZE=\"2\">(%s) </FONT><B>%s</B>", mdate, what);
else
g_snprintf(buf, BUF_LONG, "<B>%s</B>", what);
g_snprintf(buf2, sizeof(buf2), "<FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B><BR>",
- mdate, what);
+ mdate, what);
gtk_imhtml_append_text(GTK_IMHTML(c->text), buf2, 0);
@@ -1461,11 +1458,11 @@
if (convo_options & OPT_CONVO_SHOW_TIME)
g_snprintf(buf, BUF_LONG, "<FONT COLOR=\"%s\"><FONT SIZE=\"2\">(%s) </FONT>"
- "<B>%s</B></FONT> ", colour, mdate, str);
+ "<B>%s</B></FONT> ", colour, mdate, str);
else
g_snprintf(buf, BUF_LONG, "<FONT COLOR=\"%s\"><B>%s</B></FONT> ", colour, str);
g_snprintf(buf2, BUF_LONG, "<FONT COLOR=\"%s\"><FONT SIZE=\"2\"><!--(%s) --></FONT>"
- "<B>%s</B></FONT> ", colour, mdate, str);
+ "<B>%s</B></FONT> ", colour, mdate, str);
g_free(str);
@@ -1539,19 +1536,22 @@
if ((c->is_chat && (chat_options & OPT_CHAT_POPUP)) ||
(!c->is_chat && (im_options & OPT_IM_POPUP)))
- gdk_window_show(c->window->window);
+ gdk_window_show(c->window->window);
if (((flags & WFLAG_RECV) || (flags & WFLAG_SYSTEM)) &&
((!c->is_chat && (im_options & OPT_IM_ONE_WINDOW) &&
(gtk_notebook_get_current_page(GTK_NOTEBOOK(convo_notebook))
- != g_list_index(conversations, c))) ||
- ( c->is_chat && (chat_options & OPT_CHAT_ONE_WINDOW) &&
+ != g_list_index(conversations, c))) ||
+ (c->is_chat && (chat_options & OPT_CHAT_ONE_WINDOW) &&
(gtk_notebook_get_current_page(GTK_NOTEBOOK(chat_notebook))
- != g_list_index(chats, c))))) {
+ != g_list_index(chats, c))))) {
GtkWidget *notebook = (c->is_chat ? chat_notebook : convo_notebook);
GList *ws = (c->is_chat ? chats : conversations);
GtkWidget *label = gtk_notebook_get_tab_label(GTK_NOTEBOOK(notebook),
- gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), g_list_index(ws, c)));
+ gtk_notebook_get_nth_page(GTK_NOTEBOOK
+ (notebook),
+ g_list_index(ws,
+ c)));
GtkStyle *style = gtk_style_new();
if (!GTK_WIDGET_REALIZED(label))
gtk_widget_realize(label);
@@ -1732,9 +1732,9 @@
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), FALSE);
state_lock = 0;
- save = gtk_toolbar_append_item (GTK_TOOLBAR(toolbar),
- NULL, _("Save Conversation"),
- _("Save"), save_p, GTK_SIGNAL_FUNC(save_convo), c);
+ save = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ NULL, _("Save Conversation"),
+ _("Save"), save_p, GTK_SIGNAL_FUNC(save_convo), c);
speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
@@ -1944,8 +1944,7 @@
void update_buttons_by_protocol(struct conversation *c)
{
- if (!c->gc)
- {
+ if (!c->gc) {
gtk_widget_set_sensitive(c->info, FALSE);
gtk_widget_set_sensitive(c->send, FALSE);
gtk_widget_set_sensitive(c->warn, FALSE);
@@ -1954,7 +1953,7 @@
return;
}
-
+
if (c->gc->prpl->get_info == NULL && c->info)
gtk_widget_set_sensitive(c->info, FALSE);
else if (c->info)
@@ -1985,16 +1984,14 @@
if (c->add)
update_convo_add_button(c);
- if (c->whisper)
- {
+ if (c->whisper) {
if (c->gc->prpl->chat_whisper == NULL)
gtk_widget_set_sensitive(c->whisper, FALSE);
else
gtk_widget_set_sensitive(c->whisper, TRUE);
}
- if (c->invite)
- {
+ if (c->invite) {
if (c->gc->prpl->chat_invite == NULL)
gtk_widget_set_sensitive(c->invite, FALSE);
else
@@ -2005,7 +2002,9 @@
static void convo_switch(GtkNotebook *notebook, GtkWidget *page, gint page_num, gpointer data)
{
GtkWidget *label = gtk_notebook_get_tab_label(GTK_NOTEBOOK(convo_notebook),
- gtk_notebook_get_nth_page(GTK_NOTEBOOK(convo_notebook), page_num));
+ gtk_notebook_get_nth_page(GTK_NOTEBOOK
+ (convo_notebook),
+ page_num));
GtkStyle *style;
struct conversation *c = g_list_nth_data(conversations, page_num);
if (c && c->window && c->entry)
@@ -2076,18 +2075,18 @@
if (im_options & OPT_IM_SIDE_TAB) {
if (im_options & OPT_IM_BR_TAB) {
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook),
- GTK_POS_RIGHT);
+ GTK_POS_RIGHT);
} else {
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook),
- GTK_POS_LEFT);
+ GTK_POS_LEFT);
}
- } else {
+ } else {
if (im_options & OPT_IM_BR_TAB) {
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook),
- GTK_POS_BOTTOM);
+ GTK_POS_BOTTOM);
} else {
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook),
- GTK_POS_TOP);
+ GTK_POS_TOP);
}
}
gtk_notebook_set_scrollable(GTK_NOTEBOOK(convo_notebook), TRUE);
@@ -2250,7 +2249,7 @@
style = gtk_widget_get_style(GTK_WIDGET(entry));
gtk_imhtml_set_defaults(GTK_IMHTML(text), 0, &style->fg[GTK_STATE_NORMAL],
&style->base[GTK_STATE_NORMAL]);
-
+
gtk_widget_show(win);
}
@@ -2405,8 +2404,11 @@
void set_convo_tab_label(struct conversation *c, char *text)
{
gtk_label_set_text(GTK_LABEL(gtk_notebook_get_tab_label(GTK_NOTEBOOK(convo_notebook),
- gtk_notebook_get_nth_page(GTK_NOTEBOOK(convo_notebook),
- g_list_index(conversations, c)))), text);
+ gtk_notebook_get_nth_page(GTK_NOTEBOOK
+ (convo_notebook),
+ g_list_index
+ (conversations,
+ c)))), text);
}
void raise_convo_tab(struct conversation *c)
@@ -2415,46 +2417,40 @@
gdk_window_show(c->window->window);
}
-void update_im_tabs() {
+void update_im_tabs()
+{
if (!convo_notebook || !all_convos)
return;
if (im_options & OPT_IM_SIDE_TAB) {
if (im_options & OPT_IM_BR_TAB) {
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook),
- GTK_POS_RIGHT);
+ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook), GTK_POS_RIGHT);
} else {
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook),
- GTK_POS_LEFT);
+ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook), GTK_POS_LEFT);
}
- } else {
+ } else {
if (im_options & OPT_IM_BR_TAB) {
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook),
- GTK_POS_BOTTOM);
+ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook), GTK_POS_BOTTOM);
} else {
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook),
- GTK_POS_TOP);
+ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(convo_notebook), GTK_POS_TOP);
}
}
}
-void update_chat_tabs() {
+void update_chat_tabs()
+{
if (!chat_notebook || !all_chats)
return;
if (chat_options & OPT_CHAT_SIDE_TAB) {
if (chat_options & OPT_CHAT_BR_TAB) {
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook),
- GTK_POS_RIGHT);
+ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook), GTK_POS_RIGHT);
} else {
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook),
- GTK_POS_LEFT);
+ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook), GTK_POS_LEFT);
}
} else {
if (chat_options & OPT_CHAT_BR_TAB) {
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook),
- GTK_POS_BOTTOM);
+ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook), GTK_POS_BOTTOM);
} else {
- gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook),
- GTK_POS_TOP);
+ gtk_notebook_set_tab_pos(GTK_NOTEBOOK(chat_notebook), GTK_POS_TOP);
}
}
}
@@ -2468,10 +2464,12 @@
b = c->data;
c = c->next;
if (fg) {
- if (b->hasfg) continue;
+ if (b->hasfg)
+ continue;
b->fgcol = fgcolor;
} else {
- if (b->hasbg) continue;
+ if (b->hasbg)
+ continue;
b->bgcol = bgcolor;
}
}
@@ -2485,7 +2483,8 @@
while (c) {
b = c->data;
c = c->next;
- if (b->hasfont) continue;
+ if (b->hasfont)
+ continue;
sprintf(b->fontface, "%s", fontface);
}
}
@@ -2523,21 +2522,20 @@
case GDK_PIXBUF_FRAME_RETAIN:
buf = gdk_pixbuf_frame_get_pixbuf(frame);
scale = gdk_pixbuf_scale_simple(buf,
- MAX(gdk_pixbuf_get_width(buf) * SCALE(c->anim) /
- gdk_pixbuf_animation_get_width(c->anim), 1),
- MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
- gdk_pixbuf_animation_get_height(c->anim), 1),
- GDK_INTERP_NEAREST);
+ MAX(gdk_pixbuf_get_width(buf) * SCALE(c->anim) /
+ gdk_pixbuf_animation_get_width(c->anim), 1),
+ MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
+ gdk_pixbuf_animation_get_height(c->anim), 1),
+ GDK_INTERP_NEAREST);
gdk_pixbuf_render_pixmap_and_mask(scale, &src, NULL, 0);
gdk_pixbuf_unref(scale);
gtk_pixmap_get(GTK_PIXMAP(c->icon), &pm, &bm);
gc = gdk_gc_new(pm);
gdk_draw_pixmap(pm, gc, src, 0, 0,
MAX(gdk_pixbuf_frame_get_x_offset(frame) * SCALE(c->anim) /
- gdk_pixbuf_animation_get_width(c->anim), 1),
+ gdk_pixbuf_animation_get_width(c->anim), 1),
MAX(gdk_pixbuf_frame_get_y_offset(frame) * SCALE(c->anim) /
- gdk_pixbuf_animation_get_height(c->anim), 1),
- -1, -1);
+ gdk_pixbuf_animation_get_height(c->anim), 1), -1, -1);
gdk_pixmap_unref(src);
gtk_widget_queue_draw(c->icon);
gdk_gc_unref(gc);
@@ -2545,11 +2543,11 @@
case GDK_PIXBUF_FRAME_DISPOSE:
buf = gdk_pixbuf_frame_get_pixbuf(frame);
scale = gdk_pixbuf_scale_simple(buf,
- MAX(gdk_pixbuf_get_width(buf) * SCALE(c->anim) /
- gdk_pixbuf_animation_get_width(c->anim), 1),
- MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
- gdk_pixbuf_animation_get_height(c->anim), 1),
- GDK_INTERP_NEAREST);
+ MAX(gdk_pixbuf_get_width(buf) * SCALE(c->anim) /
+ gdk_pixbuf_animation_get_width(c->anim), 1),
+ MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
+ gdk_pixbuf_animation_get_height(c->anim), 1),
+ GDK_INTERP_NEAREST);
gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 0);
gdk_pixbuf_unref(scale);
gtk_pixmap_set(GTK_PIXMAP(c->icon), pm, bm);
@@ -2561,11 +2559,11 @@
frame = frames->data;
buf = gdk_pixbuf_frame_get_pixbuf(frame);
scale = gdk_pixbuf_scale_simple(buf,
- MAX(gdk_pixbuf_get_width(buf) * SCALE(c->anim) /
- gdk_pixbuf_animation_get_width(c->anim), 1),
- MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
- gdk_pixbuf_animation_get_height(c->anim), 1),
- GDK_INTERP_NEAREST);
+ MAX(gdk_pixbuf_get_width(buf) * SCALE(c->anim) /
+ gdk_pixbuf_animation_get_width(c->anim), 1),
+ MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
+ gdk_pixbuf_animation_get_height(c->anim), 1),
+ GDK_INTERP_NEAREST);
gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 0);
gdk_pixbuf_unref(scale);
gtk_pixmap_set(GTK_PIXMAP(c->icon), pm, bm);
@@ -2638,11 +2636,11 @@
GdkPixbuf *buf = gdk_pixbuf_frame_get_pixbuf(frames->data);
sf = SCALE(c->anim);
scale = gdk_pixbuf_scale_simple(buf,
- MAX(gdk_pixbuf_get_width(buf) * sf /
- gdk_pixbuf_animation_get_width(c->anim), 1),
- MAX(gdk_pixbuf_get_height(buf) * sf /
- gdk_pixbuf_animation_get_height(c->anim), 1),
- GDK_INTERP_NEAREST);
+ MAX(gdk_pixbuf_get_width(buf) * sf /
+ gdk_pixbuf_animation_get_width(c->anim), 1),
+ MAX(gdk_pixbuf_get_height(buf) * sf /
+ gdk_pixbuf_animation_get_height(c->anim), 1),
+ GDK_INTERP_NEAREST);
if (gdk_pixbuf_animation_get_num_frames(c->anim) > 1) {
int delay = MAX(gdk_pixbuf_frame_get_delay_time(frames->data), 13);
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- dialogs.c 2001/09/27 09:20:47 1.249
+++ dialogs.c 2001/09/27 19:17:10 1.250
@@ -32,7 +32,7 @@
#include <ctype.h>
#include <sys/socket.h>
#include <netdb.h>
-#include <netinet/in.h>
+#include <netinet/in.h>
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -81,7 +81,7 @@
GdkColor bgcolor;
GdkColor fgcolor;
[...3754 lines suppressed...]
}
gtk_file_selection_set_filename(GTK_FILE_SELECTION(perl_config), buf);
- gtk_file_selection_complete(GTK_FILE_SELECTION(perl_config), "*.pl");
- gtk_signal_connect(GTK_OBJECT(perl_config), "destroy", GTK_SIGNAL_FUNC(cfdes),
- perl_config);
+ gtk_file_selection_complete(GTK_FILE_SELECTION(perl_config), "*.pl");
+ gtk_signal_connect(GTK_OBJECT(perl_config), "destroy", GTK_SIGNAL_FUNC(cfdes), perl_config);
gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(perl_config)->ok_button),
- "clicked", GTK_SIGNAL_FUNC(do_load), NULL);
-
+ "clicked", GTK_SIGNAL_FUNC(do_load), NULL);
+
gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(perl_config)->cancel_button),
- "clicked", GTK_SIGNAL_FUNC(cfdes), NULL);
+ "clicked", GTK_SIGNAL_FUNC(cfdes), NULL);
g_free(buf);
gtk_widget_show(perl_config);
Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- gaimrc.c 2001/09/27 09:02:06 1.80
+++ gaimrc.c 2001/09/27 19:17:10 1.81
@@ -219,8 +219,7 @@
/* auto { time } { default message } */
else if (!strcmp(p->option, "auto")) {
auto_away = atoi(p->value[0]);
- defaul...
[truncated message content] |
|
From: Eric W. <war...@us...> - 2001-09-27 17:44:27
|
Update of /cvsroot/gaim/gaim/src/protocols/toc
In directory usw-pr-cvs1:/tmp/cvs-serv31341/src/protocols/toc
Modified Files:
toc.c
Log Message:
continuing the big code reorganization
Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- toc.c 2001/09/22 02:19:48 1.22
+++ toc.c 2001/09/27 17:44:23 1.23
@@ -208,6 +208,74 @@
g_free(gc->proto_data);
}
+static int escape_message(char *msg)
+{
+ char *c, *cpy;
+ int cnt = 0;
+ /* Assumes you have a buffer able to cary at least BUF_LEN * 2 bytes */
+ if (strlen(msg) > BUF_LEN) {
+ debug_printf("Warning: truncating message to 2048 bytes\n");
+ msg[2047] = '\0';
+ }
+
+ cpy = g_strdup(msg);
+ c = cpy;
+ while (*c) {
+ switch (*c) {
+ case '$':
+ case '[':
+ case ']':
+ case '(':
+ case ')':
+ case '#':
+ msg[cnt++] = '\\';
+ /* Fall through */
+ default:
+ msg[cnt++] = *c;
+ }
+ c++;
+ }
+ msg[cnt] = '\0';
+ g_free(cpy);
+ return cnt;
+}
+
+static int escape_text(char *msg)
+{
+ char *c, *cpy;
+ int cnt = 0;
+ /* Assumes you have a buffer able to cary at least BUF_LEN * 4 bytes */
+ if (strlen(msg) > BUF_LEN) {
+ fprintf(stderr, "Warning: truncating message to 2048 bytes\n");
+ msg[2047] = '\0';
+ }
+
+ cpy = g_strdup(msg);
+ c = cpy;
+ while (*c) {
+ switch (*c) {
+ case '\n':
+ msg[cnt++] = '<';
+ msg[cnt++] = 'B';
+ msg[cnt++] = 'R';
+ msg[cnt++] = '>';
+ break;
+ case '{':
+ case '}':
+ case '\\':
+ case '"':
+ msg[cnt++] = '\\';
+ /* Fall through */
+ default:
+ msg[cnt++] = *c;
+ }
+ c++;
+ }
+ msg[cnt] = '\0';
+ g_free(cpy);
+ return cnt;
+}
+
static int sflap_send(struct gaim_connection *gc, char *buf, int olen, int type)
{
int len;
@@ -1080,7 +1148,8 @@
static void toc_chat_whisper(struct gaim_connection *g, int id, char *who, char *message)
{
char buf2[BUF_LEN * 2];
- g_snprintf(buf2, sizeof(buf2), "toc_chat_whisper %d %s \"%s\"", id, who, message);
+ escape_text(message);
+ g_snprintf(buf2, sizeof(buf2), "toc_chat_whisper %d %s \"%s\"", id, normalize(who), message);
sflap_send(g, buf2, -1, TYPE_DATA);
}
|
|
From: Eric W. <war...@us...> - 2001-09-27 17:44:27
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv31341/src
Modified Files:
buddy_chat.c gaim.h util.c
Log Message:
continuing the big code reorganization
Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- buddy_chat.c 2001/09/27 06:04:59 1.114
+++ buddy_chat.c 2001/09/27 17:44:23 1.115
@@ -530,7 +530,6 @@
gtk_editable_delete_text(GTK_EDITABLE(b->entry), 0, -1);
- escape_text(buf); /* it's ok to leave this here because oscar can't whisper */
serv_chat_whisper(b->gc, b->id, who, buf);
g_snprintf(buf2, sizeof(buf2), "%s->%s", b->gc->username, who);
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- gaim.h 2001/09/27 09:20:47 1.263
+++ gaim.h 2001/09/27 17:44:23 1.264
@@ -616,9 +616,7 @@
/* Functions in util.c */
extern char *normalize(const char *);
-extern int escape_text(char *);
extern char *escape_text2(const char *);
-extern int escape_message(char *msg);
extern char *tobase64(const char *);
extern void frombase64(const char *, char **, int *);
extern gint clean_pid(gpointer);
Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- util.c 2001/09/27 09:20:47 1.102
+++ util.c 2001/09/27 17:44:23 1.103
@@ -477,76 +477,6 @@
return open_gaim_log_file("system", &x);
}
-/* we only need this for TOC, because messages must be escaped */
-int escape_message(char *msg)
-{
- char *c, *cpy;
- int cnt = 0;
- /* Assumes you have a buffer able to cary at least BUF_LEN * 2 bytes */
- if (strlen(msg) > BUF_LEN) {
- debug_printf("Warning: truncating message to 2048 bytes\n");
- msg[2047] = '\0';
- }
-
- cpy = g_strdup(msg);
- c = cpy;
- while (*c) {
- switch (*c) {
- case '$':
- case '[':
- case ']':
- case '(':
- case ')':
- case '#':
- msg[cnt++] = '\\';
- /* Fall through */
- default:
- msg[cnt++] = *c;
- }
- c++;
- }
- msg[cnt] = '\0';
- g_free(cpy);
- return cnt;
-}
-
-/* we don't need this for oscar either */
-int escape_text(char *msg)
-{
- char *c, *cpy;
- int cnt = 0;
- /* Assumes you have a buffer able to cary at least BUF_LEN * 4 bytes */
- if (strlen(msg) > BUF_LEN) {
- fprintf(stderr, "Warning: truncating message to 2048 bytes\n");
- msg[2047] = '\0';
- }
-
- cpy = g_strdup(msg);
- c = cpy;
- while (*c) {
- switch (*c) {
- case '\n':
- msg[cnt++] = '<';
- msg[cnt++] = 'B';
- msg[cnt++] = 'R';
- msg[cnt++] = '>';
- break;
- case '{':
- case '}':
- case '\\':
- case '"':
- msg[cnt++] = '\\';
- /* Fall through */
- default:
- msg[cnt++] = *c;
- }
- c++;
- }
- msg[cnt] = '\0';
- g_free(cpy);
- return cnt;
-}
-
char *escape_text2(const char *msg)
{
char *c, *cpy;
|
|
From: Eric W. <war...@us...> - 2001-09-27 09:20:50
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv8845
Modified Files:
dialogs.c gaim.h perl.c sound.c util.c
Log Message:
moving gtk out of perl and sound. i don't know why i'm moving it out of sound though.
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- dialogs.c 2001/09/22 07:02:30 1.248
+++ dialogs.c 2001/09/27 09:20:47 1.249
@@ -4039,3 +4039,74 @@
gtk_widget_show_all(rename_bud_dialog);
}
+
+static GtkWidget *perl_config = NULL;
+static char *perl_last_dir = NULL;
+
+static void cfdes(GtkWidget *m, gpointer n) {
+ if (perl_config) gtk_widget_destroy(perl_config);
+ perl_config = NULL;
+}
+
+static void do_load(GtkWidget *m, gpointer n) {
+ const char *file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(perl_config));
+ gchar *f = NULL;
+ if (!file || !strlen(file)) {
+ return;
+ }
+
+ if (file_is_dir(file, perl_config)) {
+ return;
+ }
+
+ if (perl_last_dir) {
+ g_free(perl_last_dir);
+ }
+ perl_last_dir = g_dirname(file);
+
+ debug_printf("Loading perl script: %s\n", file);
+
+ f = g_strdup(file);
+ perl_load_file(f);
+ g_free(f);
+ cfdes(perl_config, NULL);
+}
+
+void load_perl_script()
+{
+ char *buf, *temp;
+
+ if (perl_config) {
+ gtk_widget_show(perl_config);
+ gdk_window_raise(perl_config->window);
+ return;
+ }
+
+ /* Below is basically stolen from plugins.c */
+ perl_config = gtk_file_selection_new(_("Gaim - Select Perl Script"));
+
+ gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(perl_config));
+
+ if (!perl_last_dir) {
+ temp = gaim_user_dir();
+ buf = g_strconcat(temp, G_DIR_SEPARATOR_S, NULL);
+ g_free(temp);
+ } else {
+ buf = g_strconcat(perl_last_dir, G_DIR_SEPARATOR_S, NULL);
+ }
+
+ gtk_file_selection_set_filename(GTK_FILE_SELECTION(perl_config), buf);
+ gtk_file_selection_complete(GTK_FILE_SELECTION(perl_config), "*.pl");
+ gtk_signal_connect(GTK_OBJECT(perl_config), "destroy", GTK_SIGNAL_FUNC(cfdes),
+ perl_config);
+
+ gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(perl_config)->ok_button),
+ "clicked", GTK_SIGNAL_FUNC(do_load), NULL);
+
+ gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(perl_config)->cancel_button),
+ "clicked", GTK_SIGNAL_FUNC(cfdes), NULL);
+
+ g_free(buf);
+ gtk_widget_show(perl_config);
+ gdk_window_raise(perl_config->window);
+}
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -d -r1.262 -r1.263
--- gaim.h 2001/09/27 06:04:59 1.262
+++ gaim.h 2001/09/27 09:20:47 1.263
@@ -621,7 +621,7 @@
extern int escape_message(char *msg);
extern char *tobase64(const char *);
extern void frombase64(const char *, char **, int *);
-extern gint clean_pid(void *);
+extern gint clean_pid(gpointer);
extern char *date();
extern gint linkify_text(char *);
extern void aol_icon(GdkWindow *);
@@ -796,12 +796,11 @@
/* Functions in perl.c */
#ifdef USE_PERL
extern void perl_autoload();
-extern int perl_load_file(char *);
extern void perl_end();
extern int perl_event(char *, char *);
-extern void load_perl_script(GtkWidget *, gpointer);
-extern void unload_perl_scripts(GtkWidget *, gpointer);
-extern void list_perl_scripts(GtkWidget *, gpointer);
+extern int perl_load_file(char *);
+extern void unload_perl_scripts();
+extern void list_perl_scripts();
#endif
/* Functions in plugins.c */
@@ -886,6 +885,7 @@
extern void set_color_selection(GtkWidget *selection, GdkColor color);
extern void show_rename_group(GtkWidget *, struct group *);
extern void show_rename_buddy(GtkWidget *, struct buddy *);
+extern void load_perl_script();
/* Functions in browser.c */
extern void open_url(GtkWidget *, char *);
Index: perl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/perl.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- perl.c 2001/09/24 19:32:57 1.57
+++ perl.c 2001/09/27 09:20:47 1.58
@@ -48,7 +48,6 @@
#include <stdio.h>
#include <dirent.h>
#include <string.h>
-#include <gtk/gtk.h>
/* perl module support */
@@ -82,7 +81,6 @@
static GList *perl_timeout_handlers = NULL;
static GList *perl_event_handlers = NULL;
static PerlInterpreter *my_perl = NULL;
-static char* last_dir = NULL;
static void perl_init();
/* dealing with gaim */
@@ -257,7 +255,7 @@
while (perl_timeout_handlers) {
thn = perl_timeout_handlers->data;
perl_timeout_handlers = g_list_remove(perl_timeout_handlers, thn);
- gtk_timeout_remove(thn->iotag);
+ g_source_remove(thn->iotag);
g_free(thn->handler_name);
g_free(thn);
}
@@ -681,8 +679,9 @@
XSRETURN_EMPTY;
}
-static int perl_timeout(struct _perl_timeout_handlers *handler)
+static int perl_timeout(gpointer data)
{
+ struct _perl_timeout_handlers *handler = data;
execute_perl(handler->handler_name, "");
perl_timeout_handlers = g_list_remove(perl_timeout_handlers, handler);
g_free(handler->handler_name);
@@ -704,89 +703,17 @@
debug_printf("Adding timeout for %d seconds.\n", timeout/1000);
handler->handler_name = g_strdup(SvPV(ST(1), junk));
perl_timeout_handlers = g_list_append(perl_timeout_handlers, handler);
- handler->iotag = gtk_timeout_add(timeout, (GtkFunction)perl_timeout, handler);
+ handler->iotag = g_timeout_add(timeout, perl_timeout, handler);
XSRETURN_EMPTY;
}
-
-static GtkWidget *config = NULL;
-
-static void cfdes(GtkWidget *m, gpointer n) {
- if (config) gtk_widget_destroy(config);
- config = NULL;
-}
-static void do_load(GtkWidget *m, gpointer n) {
- const char *file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(config));
- gchar *f = NULL;
- if (!file || !strlen(file)) {
- perl_end();
- perl_init();
- return;
- }
-
- if (file_is_dir(file, config)) {
- return;
- }
-
- if (last_dir) {
- g_free(last_dir);
- }
- last_dir = g_dirname(file);
-
- debug_printf("Loading perl script: %s\n", file);
-
- f = g_strdup(file);
- perl_load_file(f);
- g_free(f);
- cfdes(config, NULL);
-}
-
-void load_perl_script(GtkWidget *w, gpointer d)
-{
- char *buf, *temp;
-
- if (config) {
- gtk_widget_show(config);
- gdk_window_raise(config->window);
- return;
- }
-
- /* Below is basically stolen from plugins.c */
- config = gtk_file_selection_new(_("Gaim - Select Perl Script"));
-
- gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(config));
-
- if (!last_dir) {
- temp = gaim_user_dir();
- buf = g_strconcat(temp, G_DIR_SEPARATOR_S, NULL);
- g_free(temp);
- } else {
- buf = g_strconcat(last_dir, G_DIR_SEPARATOR_S, NULL);
- }
-
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(config), buf);
- gtk_file_selection_complete(GTK_FILE_SELECTION(config), "*.pl");
- gtk_signal_connect(GTK_OBJECT(config), "destroy", GTK_SIGNAL_FUNC(cfdes),
- config);
-
- gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(config)->ok_button),
- "clicked", GTK_SIGNAL_FUNC(do_load), NULL);
-
- gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(config)->cancel_button),
- "clicked", GTK_SIGNAL_FUNC(cfdes), NULL);
-
- g_free(buf);
- gtk_widget_show(config);
- gdk_window_raise(config->window);
-}
-
-extern void unload_perl_scripts(GtkWidget *w, gpointer d)
+extern void unload_perl_scripts()
{
perl_end();
perl_init();
}
-extern void list_perl_scripts(GtkWidget *w, gpointer d)
+extern void list_perl_scripts()
{
GList *s = perl_list;
struct perlscript *p;
Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- sound.c 2001/09/08 23:42:20 1.36
+++ sound.c 2001/09/27 09:20:47 1.37
@@ -27,7 +27,6 @@
#include <string.h>
#include <sys/time.h>
#include <unistd.h>
-#include <gtk/gtk.h>
#include <fcntl.h>
#include <sys/wait.h>
#include <unistd.h>
@@ -427,7 +426,7 @@
_exit(0);
} else {
- gtk_timeout_add(100, (GtkFunction)clean_pid, NULL);
+ g_timeout_add(100, clean_pid, NULL);
}
}
@@ -481,7 +480,7 @@
_exit(0);
} else {
- gtk_timeout_add(100, (GtkFunction)clean_pid, NULL);
+ g_timeout_add(100, clean_pid, NULL);
}
}
Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- util.c 2001/09/20 01:20:29 1.101
+++ util.c 2001/09/27 09:20:47 1.102
@@ -742,7 +742,7 @@
}
-gint clean_pid(void *dummy)
+gboolean clean_pid(gpointer dummy)
{
int status;
pid_t pid;
|
|
From: Eric W. <war...@us...> - 2001-09-27 09:02:10
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv2255
Modified Files:
gaimrc.c html.c
Log Message:
gaimrc.c doesn't need gtk. html.c can live without gtk. plus this is a better implementation.
Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- gaimrc.c 2001/09/23 20:32:30 1.79
+++ gaimrc.c 2001/09/27 09:02:06 1.80
@@ -31,7 +31,6 @@
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
-#include <gtk/gtk.h>
#include "gaim.h"
#include "prpl.h"
#include "proxy.h"
Index: html.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/html.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- html.c 2001/07/31 23:23:40 1.18
+++ html.c 2001/09/27 09:02:07 1.19
@@ -27,9 +27,6 @@
#include <stdlib.h>
#include <sys/time.h>
#include <unistd.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
#include "gaim.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -114,19 +111,19 @@
gpointer data;
struct g_url website;
char *url;
+
+ int inpa;
+
+ gboolean sentreq;
+ char *webdata;
+ int len;
+ gboolean startsaving;
};
-static void grab_url_callback(gpointer dat, gint sock, GdkInputCondition cond)
+static void grab_url_callback(gpointer dat, gint sock, GaimInputCondition cond)
{
struct grab_url_data *gunk = dat;
- char *webdata = NULL;
- int len;
- int read_rv;
- int datalen = 0;
- char buf[256];
char data;
- int startsaving = 0;
- GtkWidget *pw = NULL, *pbar = NULL, *label;
if (sock == -1) {
gunk->callback(gunk->data, NULL);
@@ -135,90 +132,57 @@
return;
}
- g_snprintf(buf, sizeof(buf), "GET /%s HTTP/1.0\r\n\r\n", gunk->website.page);
- debug_printf("Request: %s\n", buf);
- write(sock, buf, strlen(buf));
- fcntl(sock, F_SETFL, O_NONBLOCK);
-
- webdata = NULL;
- len = 0;
+ if (!gunk->sentreq) {
+ char buf[256];
+ g_snprintf(buf, sizeof(buf), "GET /%s HTTP/1.0\r\n\r\n", gunk->website.page);
+ debug_printf("Request: %s\n", buf);
+ write(sock, buf, strlen(buf));
+ fcntl(sock, F_SETFL, O_NONBLOCK);
+ gunk->sentreq = TRUE;
+ gunk->inpa = gaim_input_add(sock, GAIM_INPUT_READ, grab_url_callback, dat);
+ return;
+ }
- /*
- * avoid fgetc(), it causes problems on solaris
- while ((data = fgetc(sockfile)) != EOF) {
- */
- /* read_rv will be 0 on EOF and < 0 on error, so this should be fine */
- while ((read_rv = read(sock, &data, 1)) > 0 || errno == EWOULDBLOCK) {
+ if (read(sock, &data, 1) > 0 || errno == EWOULDBLOCK) {
if (errno == EWOULDBLOCK) {
errno = 0;
- continue;
+ return;
}
-
- if (!data)
- continue;
-
- if (!startsaving && data == '<') {
-#ifdef HAVE_STRSTR
- char *cs = strstr(webdata, "Content-Length");
- if (cs) {
- char tmpbuf[1024];
- sscanf(cs, "Content-Length: %d", &datalen);
-
- g_snprintf(tmpbuf, 1024, _("Getting %d bytes from %s"),
- datalen, gunk->url);
- pw = gtk_dialog_new();
-
- label = gtk_label_new(tmpbuf);
- gtk_widget_show(label);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pw)->vbox),
- label, FALSE, FALSE, 5);
-
- pbar = gtk_progress_bar_new();
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pw)->action_area),
- pbar, FALSE, FALSE, 5);
- gtk_widget_show(pbar);
- gtk_window_set_title(GTK_WINDOW(pw), _("Getting Data"));
-
- gtk_widget_realize(pw);
- aol_icon(pw->window);
-
- gtk_widget_show(pw);
- } else
- datalen = 0;
-#else
- datalen = 0;
-#endif
- g_free(webdata);
- webdata = NULL;
- len = 0;
- startsaving = 1;
+ if (!gunk->startsaving && data == '<') {
+ if (gunk->webdata)
+ g_free(gunk->webdata);
+ gunk->webdata = NULL;
+ gunk->len = 0;
+ gunk->startsaving = 1;
}
-
- len++;
- webdata = g_realloc(webdata, len);
- webdata[len - 1] = data;
-
- if (pbar)
- gtk_progress_bar_update(GTK_PROGRESS_BAR(pbar), ((100 * len) / datalen) / 100.0);
-
- while (gtk_events_pending())
- gtk_main_iteration();
- }
- webdata = g_realloc(webdata, len + 1);
- webdata[len] = 0;
-
+ gunk->len++;
+ gunk->webdata = g_realloc(gunk->webdata, gunk->len);
+ gunk->webdata[gunk->len - 1] = data;
+ } else if (errno != ETIMEDOUT) {
- debug_printf(_("Receieved: '%s'\n"), webdata);
+ gunk->webdata = g_realloc(gunk->webdata, gunk->len + 1);
+ gunk->webdata[gunk->len] = 0;
- if (pw)
- gtk_widget_destroy(pw);
+ debug_printf(_("Receieved: '%s'\n"), gunk->webdata);
- close(sock);
- gunk->callback(gunk->data, webdata);
- g_free(gunk->url);
- g_free(gunk);
+ gaim_input_remove(gunk->inpa);
+ close(sock);
+ gunk->callback(gunk->data, gunk->webdata);
+ if (gunk->webdata)
+ g_free(gunk->webdata);
+ g_free(gunk->url);
+ g_free(gunk);
+ } else {
+ gaim_input_remove(gunk->inpa);
+ close(sock);
+ gunk->callback(gunk->data, NULL);
+ if (gunk->webdata)
+ g_free(gunk->webdata);
+ g_free(gunk->url);
+ g_free(gunk);
+ }
}
void grab_url(char *url, void (*callback)(gpointer, char *), gpointer data)
|
|
From: Eric W. <war...@us...> - 2001-09-27 06:05:02
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv15276
Modified Files:
buddy_chat.c gaim.h
Log Message:
i finally fixed this.
Index: buddy_chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy_chat.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- buddy_chat.c 2001/09/22 11:35:00 1.113
+++ buddy_chat.c 2001/09/27 06:04:59 1.114
@@ -1110,6 +1110,9 @@
void chat_set_topic(struct conversation *b, char* who, char* topic)
{
gtk_entry_set_text(GTK_ENTRY(b->topic_text), topic);
+ if (b->topic)
+ g_free(b->topic);
+ b->topic = g_strdup(topic);
}
@@ -1125,6 +1128,8 @@
b->ignored = g_list_remove(b->ignored, b->ignored->data);
}
g_string_free(b->history, TRUE);
+ if (b->topic)
+ g_free(b->topic);
g_free(b);
}
@@ -1219,12 +1224,14 @@
void chat_tabize()
{
+ int pos = 0;
/* evil, evil i tell you! evil! */
if (chat_options & OPT_CHAT_ONE_WINDOW) {
GList *x = chats;
while (x) {
struct conversation *c = x->data;
GtkWidget *imhtml, *win;
+ GList *r = c->in_room;
imhtml = c->text;
win = c->window;
@@ -1236,6 +1243,38 @@
GTK_SIGNAL_FUNC(close_callback), c);
gtk_widget_destroy(win);
+ if (c->topic)
+ gtk_entry_set_text(GTK_ENTRY(c->topic_text), c->topic);
+
+ while (r) {
+ char *name = r->data;
+ GtkWidget *list_item;
+ GList *ignored = c->ignored;
+ char tmp[BUF_LONG];
+
+ while (ignored) {
+ if (!g_strcasecmp(name, ignored->data))
+ break;
+ ignored = ignored->next;
+ }
+
+ if (ignored) {
+ g_snprintf(tmp, sizeof(tmp), "X %s", name);
+ list_item = gtk_list_item_new_with_label(tmp);
+ } else
+ list_item = gtk_list_item_new_with_label(name);
+
+ gtk_object_set_user_data(GTK_OBJECT(list_item), name);
+ gtk_signal_connect(GTK_OBJECT(list_item), "button_press_event",
+ GTK_SIGNAL_FUNC(right_click_chat), c);
+ gtk_list_insert_items(GTK_LIST(c->list),
+ g_list_append(NULL, list_item), pos);
+ gtk_widget_show(list_item);
+
+ r = r->next;
+ pos++;
+ }
+
x = x->next;
}
} else {
@@ -1245,12 +1284,45 @@
while (x) {
struct conversation *c = x->data;
GtkWidget *imhtml;
+ GList *r = c->in_room;
imhtml = c->text;
show_new_buddy_chat(c);
gtk_widget_destroy(c->text);
gtk_widget_reparent(imhtml, c->sw);
c->text = imhtml;
+
+ if (c->topic)
+ gtk_entry_set_text(GTK_ENTRY(c->topic_text), c->topic);
+
+ while (r) {
+ char *name = r->data;
+ GtkWidget *list_item;
+ GList *ignored = c->ignored;
+ char tmp[BUF_LONG];
+
+ while (ignored) {
+ if (!g_strcasecmp(name, ignored->data))
+ break;
+ ignored = ignored->next;
+ }
+
+ if (ignored) {
+ g_snprintf(tmp, sizeof(tmp), "X %s", name);
+ list_item = gtk_list_item_new_with_label(tmp);
+ } else
+ list_item = gtk_list_item_new_with_label(name);
+
+ gtk_object_set_user_data(GTK_OBJECT(list_item), name);
+ gtk_signal_connect(GTK_OBJECT(list_item), "button_press_event",
+ GTK_SIGNAL_FUNC(right_click_chat), c);
+ gtk_list_insert_items(GTK_LIST(c->list),
+ g_list_append(NULL, list_item), pos);
+ gtk_widget_show(list_item);
+
+ r = r->next;
+ pos++;
+ }
x = x->next;
}
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -d -r1.261 -r1.262
--- gaim.h 2001/09/22 09:14:27 1.261
+++ gaim.h 2001/09/27 06:04:59 1.262
@@ -393,6 +393,7 @@
/* stuff used just for chat */
GList *in_room;
GList *ignored;
+ char *topic;
int id;
GtkWidget *count;
GtkWidget *list;
|
|
From: Eric W. <war...@us...> - 2001-09-27 04:12:59
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv31455 Modified Files: md5.h Log Message: i don't like $Id$ Index: md5.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/md5.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- md5.h 2001/09/27 02:56:38 1.1 +++ md5.h 2001/09/27 04:12:56 1.2 @@ -21,7 +21,6 @@ gh...@al... */ -/*$Id$ */ /* Independent implementation of MD5 (RFC 1321). |
|
From: Eric W. <war...@us...> - 2001-09-27 02:56:42
|
Update of /cvsroot/gaim/gaim/src/protocols/oscar In directory usw-pr-cvs1:/tmp/cvs-serv17632/src/protocols/oscar Modified Files: Makefile.am Removed Files: md5.c md5.h Log Message: this should have been moved here originally Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 2001/09/21 20:47:37 1.2 +++ Makefile.am 2001/09/27 02:56:38 1.3 @@ -1,4 +1,4 @@ -EXTRA_DIST = aim.h aim_cbtypes.h aim_internal.h faimconfig.h md5.h README \ +EXTRA_DIST = aim.h aim_cbtypes.h aim_internal.h faimconfig.h README \ CHANGES COPYING BUGS AUTHORS pkgdir = $(libdir)/gaim @@ -24,7 +24,6 @@ im.c \ info.c \ login.c \ - md5.c \ meta.c \ misc.c \ msgcookie.c \ @@ -57,7 +56,6 @@ im.c \ info.c \ login.c \ - md5.c \ meta.c \ misc.c \ msgcookie.c \ --- md5.c DELETED --- --- md5.h DELETED --- |
|
From: Eric W. <war...@us...> - 2001-09-27 02:56:41
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv17632/src
Modified Files:
Makefile.am
Added Files:
md5.c md5.h
Log Message:
this should have been moved here originally
--- NEW FILE: md5.c ---
/*
Copyright (C) 1999 Aladdin Enterprises. All rights reserved.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
L. Peter Deutsch
gh...@al...
*/
/*
Independent implementation of MD5 (RFC 1321).
This code implements the MD5 Algorithm defined in RFC 1321.
It is derived directly from the text of the RFC and not from the
reference implementation.
The original and principal author of md5.c is L. Peter Deutsch
<gh...@al...>. Other authors are noted in the change history
that follows (in reverse chronological order):
1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
1999-05-03 lpd Original version.
*/
#include "md5.h"
#include <string.h>
#ifdef TEST
/*
* Compile with -DTEST to create a self-contained executable test program.
* The test program should print out the same values as given in section
* A.5 of RFC 1321, reproduced below.
*/
#include <string.h>
main()
{
static const char *const test[7] = {
"", /*d41d8cd98f00b204e9800998ecf8427e*/
"945399884.61923487334tuvga", /*0cc175b9c0f1b6a831c399e269772661*/
"abc", /*900150983cd24fb0d6963f7d28e17f72*/
"message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/
"abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
/*d174ab98d277d9f5a5611c2c9f419d9f*/
"12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/
};
int i;
for (i = 0; i < 7; ++i) {
md5_state_t state;
md5_byte_t digest[16];
int di;
md5_init(&state);
md5_append(&state, (const md5_byte_t *)test[i], strlen(test[i]));
md5_finish(&state, digest);
printf("MD5 (\"%s\") = ", test[i]);
for (di = 0; di < 16; ++di)
printf("%02x", digest[di]);
printf("\n");
}
return 0;
}
#endif /* TEST */
/*
* For reference, here is the program that computed the T values.
*/
#if 0
#include <math.h>
main()
{
int i;
for (i = 1; i <= 64; ++i) {
unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i)));
printf("#define T%d 0x%08lx\n", i, v);
}
return 0;
}
#endif
/*
* End of T computation program.
*/
#define T1 0xd76aa478
#define T2 0xe8c7b756
#define T3 0x242070db
#define T4 0xc1bdceee
#define T5 0xf57c0faf
#define T6 0x4787c62a
#define T7 0xa8304613
#define T8 0xfd469501
#define T9 0x698098d8
#define T10 0x8b44f7af
#define T11 0xffff5bb1
#define T12 0x895cd7be
#define T13 0x6b901122
#define T14 0xfd987193
#define T15 0xa679438e
#define T16 0x49b40821
#define T17 0xf61e2562
#define T18 0xc040b340
#define T19 0x265e5a51
#define T20 0xe9b6c7aa
#define T21 0xd62f105d
#define T22 0x02441453
#define T23 0xd8a1e681
#define T24 0xe7d3fbc8
#define T25 0x21e1cde6
#define T26 0xc33707d6
#define T27 0xf4d50d87
#define T28 0x455a14ed
#define T29 0xa9e3e905
#define T30 0xfcefa3f8
#define T31 0x676f02d9
#define T32 0x8d2a4c8a
#define T33 0xfffa3942
#define T34 0x8771f681
#define T35 0x6d9d6122
#define T36 0xfde5380c
#define T37 0xa4beea44
#define T38 0x4bdecfa9
#define T39 0xf6bb4b60
#define T40 0xbebfbc70
#define T41 0x289b7ec6
#define T42 0xeaa127fa
#define T43 0xd4ef3085
#define T44 0x04881d05
#define T45 0xd9d4d039
#define T46 0xe6db99e5
#define T47 0x1fa27cf8
#define T48 0xc4ac5665
#define T49 0xf4292244
#define T50 0x432aff97
#define T51 0xab9423a7
#define T52 0xfc93a039
#define T53 0x655b59c3
#define T54 0x8f0ccc92
#define T55 0xffeff47d
#define T56 0x85845dd1
#define T57 0x6fa87e4f
#define T58 0xfe2ce6e0
#define T59 0xa3014314
#define T60 0x4e0811a1
#define T61 0xf7537e82
#define T62 0xbd3af235
#define T63 0x2ad7d2bb
#define T64 0xeb86d391
static void
md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
{
md5_word_t
a = pms->abcd[0], b = pms->abcd[1],
c = pms->abcd[2], d = pms->abcd[3];
md5_word_t t;
#ifndef ARCH_IS_BIG_ENDIAN
# define ARCH_IS_BIG_ENDIAN 1 /* slower, default implementation */
#endif
#if ARCH_IS_BIG_ENDIAN
/*
* On big-endian machines, we must arrange the bytes in the right
* order. (This also works on machines of unknown byte order.)
*/
md5_word_t X[16];
const md5_byte_t *xp = data;
int i;
for (i = 0; i < 16; ++i, xp += 4)
X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
#else /* !ARCH_IS_BIG_ENDIAN */
/*
* On little-endian machines, we can process properly aligned data
* without copying it.
*/
md5_word_t xbuf[16];
const md5_word_t *X;
if (!((data - (const md5_byte_t *)0) & 3)) {
/* data are properly aligned */
X = (const md5_word_t *)data;
} else {
/* not aligned */
memcpy(xbuf, data, 64);
X = xbuf;
}
#endif
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
/* Round 1. */
/* Let [abcd k s i] denote the operation
a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
#define SET(a, b, c, d, k, s, Ti)\
t = a + F(b,c,d) + X[k] + Ti;\
a = ROTATE_LEFT(t, s) + b
/* Do the following 16 operations. */
SET(a, b, c, d, 0, 7, T1);
SET(d, a, b, c, 1, 12, T2);
SET(c, d, a, b, 2, 17, T3);
SET(b, c, d, a, 3, 22, T4);
SET(a, b, c, d, 4, 7, T5);
SET(d, a, b, c, 5, 12, T6);
SET(c, d, a, b, 6, 17, T7);
SET(b, c, d, a, 7, 22, T8);
SET(a, b, c, d, 8, 7, T9);
SET(d, a, b, c, 9, 12, T10);
SET(c, d, a, b, 10, 17, T11);
SET(b, c, d, a, 11, 22, T12);
SET(a, b, c, d, 12, 7, T13);
SET(d, a, b, c, 13, 12, T14);
SET(c, d, a, b, 14, 17, T15);
SET(b, c, d, a, 15, 22, T16);
#undef SET
/* Round 2. */
/* Let [abcd k s i] denote the operation
a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
#define SET(a, b, c, d, k, s, Ti)\
t = a + G(b,c,d) + X[k] + Ti;\
a = ROTATE_LEFT(t, s) + b
/* Do the following 16 operations. */
SET(a, b, c, d, 1, 5, T17);
SET(d, a, b, c, 6, 9, T18);
SET(c, d, a, b, 11, 14, T19);
SET(b, c, d, a, 0, 20, T20);
SET(a, b, c, d, 5, 5, T21);
SET(d, a, b, c, 10, 9, T22);
SET(c, d, a, b, 15, 14, T23);
SET(b, c, d, a, 4, 20, T24);
SET(a, b, c, d, 9, 5, T25);
SET(d, a, b, c, 14, 9, T26);
SET(c, d, a, b, 3, 14, T27);
SET(b, c, d, a, 8, 20, T28);
SET(a, b, c, d, 13, 5, T29);
SET(d, a, b, c, 2, 9, T30);
SET(c, d, a, b, 7, 14, T31);
SET(b, c, d, a, 12, 20, T32);
#undef SET
/* Round 3. */
/* Let [abcd k s t] denote the operation
a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
#define H(x, y, z) ((x) ^ (y) ^ (z))
#define SET(a, b, c, d, k, s, Ti)\
t = a + H(b,c,d) + X[k] + Ti;\
a = ROTATE_LEFT(t, s) + b
/* Do the following 16 operations. */
SET(a, b, c, d, 5, 4, T33);
SET(d, a, b, c, 8, 11, T34);
SET(c, d, a, b, 11, 16, T35);
SET(b, c, d, a, 14, 23, T36);
SET(a, b, c, d, 1, 4, T37);
SET(d, a, b, c, 4, 11, T38);
SET(c, d, a, b, 7, 16, T39);
SET(b, c, d, a, 10, 23, T40);
SET(a, b, c, d, 13, 4, T41);
SET(d, a, b, c, 0, 11, T42);
SET(c, d, a, b, 3, 16, T43);
SET(b, c, d, a, 6, 23, T44);
SET(a, b, c, d, 9, 4, T45);
SET(d, a, b, c, 12, 11, T46);
SET(c, d, a, b, 15, 16, T47);
SET(b, c, d, a, 2, 23, T48);
#undef SET
/* Round 4. */
/* Let [abcd k s t] denote the operation
a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
#define I(x, y, z) ((y) ^ ((x) | ~(z)))
#define SET(a, b, c, d, k, s, Ti)\
t = a + I(b,c,d) + X[k] + Ti;\
a = ROTATE_LEFT(t, s) + b
/* Do the following 16 operations. */
SET(a, b, c, d, 0, 6, T49);
SET(d, a, b, c, 7, 10, T50);
SET(c, d, a, b, 14, 15, T51);
SET(b, c, d, a, 5, 21, T52);
SET(a, b, c, d, 12, 6, T53);
SET(d, a, b, c, 3, 10, T54);
SET(c, d, a, b, 10, 15, T55);
SET(b, c, d, a, 1, 21, T56);
SET(a, b, c, d, 8, 6, T57);
SET(d, a, b, c, 15, 10, T58);
SET(c, d, a, b, 6, 15, T59);
SET(b, c, d, a, 13, 21, T60);
SET(a, b, c, d, 4, 6, T61);
SET(d, a, b, c, 11, 10, T62);
SET(c, d, a, b, 2, 15, T63);
SET(b, c, d, a, 9, 21, T64);
#undef SET
/* Then perform the following additions. (That is increment each
of the four registers by the value it had before this block
was started.) */
pms->abcd[0] += a;
pms->abcd[1] += b;
pms->abcd[2] += c;
pms->abcd[3] += d;
}
void
md5_init(md5_state_t *pms)
{
pms->count[0] = pms->count[1] = 0;
pms->abcd[0] = 0x67452301;
pms->abcd[1] = 0xefcdab89;
pms->abcd[2] = 0x98badcfe;
pms->abcd[3] = 0x10325476;
}
void
md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
{
const md5_byte_t *p = data;
int left = nbytes;
int offset = (pms->count[0] >> 3) & 63;
md5_word_t nbits = (md5_word_t)(nbytes << 3);
if (nbytes <= 0)
return;
/* Update the message length. */
pms->count[1] += nbytes >> 29;
pms->count[0] += nbits;
if (pms->count[0] < nbits)
pms->count[1]++;
/* Process an initial partial block. */
if (offset) {
int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
memcpy(pms->buf + offset, p, copy);
if (offset + copy < 64)
return;
p += copy;
left -= copy;
md5_process(pms, pms->buf);
}
/* Process full blocks. */
for (; left >= 64; p += 64, left -= 64)
md5_process(pms, p);
/* Process a final partial block. */
if (left)
memcpy(pms->buf, p, left);
}
void
md5_finish(md5_state_t *pms, md5_byte_t digest[16])
{
static const md5_byte_t pad[64] = {
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
md5_byte_t data[8];
int i;
/* Save the length before padding. */
for (i = 0; i < 8; ++i)
data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
/* Pad to 56 bytes mod 64. */
md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
/* Append the length. */
md5_append(pms, data, 8);
for (i = 0; i < 16; ++i)
digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
}
--- NEW FILE: md5.h ---
/*
Copyright (C) 1999 Aladdin Enterprises. All rights reserved.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
L. Peter Deutsch
gh...@al...
*/
/*$Id: md5.h,v 1.1 2001/09/27 02:56:38 warmenhoven Exp $ */
/*
Independent implementation of MD5 (RFC 1321).
This code implements the MD5 Algorithm defined in RFC 1321.
It is derived directly from the text of the RFC and not from the
reference implementation.
The original and principal author of md5.h is L. Peter Deutsch
<gh...@al...>. Other authors are noted in the change history
that follows (in reverse chronological order):
1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
added conditionalization for C++ compilation from Martin
Purschke <pur...@bn...>.
1999-05-03 lpd Original version.
*/
#ifndef md5_INCLUDED
# define md5_INCLUDED
/*
* This code has some adaptations for the Ghostscript environment, but it
* will compile and run correctly in any environment with 8-bit chars and
* 32-bit ints. Specifically, it assumes that if the following are
* defined, they have the same meaning as in Ghostscript: P1, P2, P3,
* ARCH_IS_BIG_ENDIAN.
*/
typedef unsigned char md5_byte_t; /* 8-bit byte */
typedef unsigned int md5_word_t; /* 32-bit word */
/* Define the state of the MD5 Algorithm. */
typedef struct md5_state_s {
md5_word_t count[2]; /* message length in bits, lsw first */
md5_word_t abcd[4]; /* digest buffer */
md5_byte_t buf[64]; /* accumulate block */
} md5_state_t;
#ifdef __cplusplus
extern "C"
{
#endif
/* Initialize the algorithm. */
#ifdef P1
void md5_init(P1(md5_state_t *pms));
#else
void md5_init(md5_state_t *pms);
#endif
/* Append a string to the message. */
#ifdef P3
void md5_append(P3(md5_state_t *pms, const md5_byte_t *data, int nbytes));
#else
void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
#endif
/* Finish the message and return the digest. */
#ifdef P2
void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16]));
#else
void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
#endif
#ifdef __cplusplus
} /* end extern "C" */
#endif
#endif /* md5_INCLUDED */
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile.am 2001/09/21 20:47:36 1.36
+++ Makefile.am 2001/09/27 02:56:38 1.37
@@ -17,6 +17,7 @@
gtkticker.c \
html.c \
idle.c \
+ md5.c \
multi.c \
perl.c \
plugins.c \
@@ -47,6 +48,7 @@
gtkticker.c \
html.c \
idle.c \
+ md5.c \
multi.c \
perl.c \
plugins.c \
@@ -76,6 +78,7 @@
gtkimhtml.h \
gtkspell.h \
gtkticker.h \
+ md5.h \
multi.h \
prpl.h \
proxy.h
|
|
From: Eric W. <war...@us...> - 2001-09-27 02:56:41
|
Update of /cvsroot/gaim/gaim/src/protocols/msn In directory usw-pr-cvs1:/tmp/cvs-serv17632/src/protocols/msn Modified Files: Makefile.am Removed Files: md5.c md5.h Log Message: this should have been moved here originally Index: Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/msn/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 2001/09/21 20:47:36 1.3 +++ Makefile.am 2001/09/27 02:56:38 1.4 @@ -11,7 +11,7 @@ pkg_LTLIBRARIES = noinst_LIBRARIES = libmsn.a -libmsn_a_SOURCES = msn.c md5.c md5.h +libmsn_a_SOURCES = msn.c else @@ -19,6 +19,6 @@ pkg_LTLIBRARIES = libmsn.la noinst_LIBRARIES = -libmsn_la_SOURCES = msn.c md5.c md5.h +libmsn_la_SOURCES = msn.c endif --- md5.c DELETED --- --- md5.h DELETED --- |
|
From: Eric W. <war...@us...> - 2001-09-26 22:24:02
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv24246/src
Modified Files:
gtkimhtml.c
Log Message:
hi
Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- gtkimhtml.c 2001/09/26 19:48:50 1.53
+++ gtkimhtml.c 2001/09/26 22:23:59 1.54
@@ -1914,9 +1914,7 @@
{ "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT }
};
- imhtml->default_font = gtk_imhtml_font_load (imhtml, NULL, FALSE, FALSE, 0);
- if (imhtml->default_font == NULL)
- g_warning ("GtkIMHtml: Could not load default font!");
+ imhtml->default_font = gdk_font_ref (GTK_WIDGET (imhtml)->style->font);
imhtml->default_fg_color = gdk_color_copy (>K_WIDGET (imhtml)->style->fg [GTK_STATE_NORMAL]);
imhtml->default_bg_color = gdk_color_copy (>K_WIDGET (imhtml)->style->base [GTK_STATE_NORMAL]);
imhtml->hand_cursor = gdk_cursor_new (GDK_HAND2);
|
6 messages has been excluded from this view by a project administrator.
