Menu
▾
▴
[Gaim-commits] CVS: gaim/src about.c,1.46,1.47 aim.c,1.158,1.159 applet.c,1.12,1.13 away.c,1.60,1.61 browser.c,1.13,1.14 buddy.c,1.244,1.245 buddy_chat.c,1.115,1.116 conversation.c,1.264,1.265 dialogs.c,1.249,1.250 gaimrc.c,1.80,1.81 html.c,1.19,1.20 idle.c,1.30,1.31 multi.c,1.78,1.79 plugins.c,1.81,1.82 prefs.c,1.181,1.182 proxy.c,1.29,1.30 prpl.c,1.33,1.34 server.c,1.192,1.193 sound.c,1.37,1.38 util.c,1.103,1.104
|
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] |
