Mercurial > pidgin.yaz
changeset 2372:2927c2c26fe6
[gaim-migrate @ 2385]
reformatting. nothing else.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Thu, 27 Sep 2001 19:17:11 +0000 |
| parents | db02399a9ad7 |
| children | 84a5ea08545a |
| files | src/about.c src/aim.c src/applet.c src/away.c src/browser.c src/buddy.c src/buddy_chat.c src/conversation.c src/dialogs.c src/gaimrc.c src/html.c src/idle.c src/multi.c src/plugins.c src/prefs.c src/proxy.c src/prpl.c src/server.c src/sound.c src/util.c |
| diffstat | 20 files changed, 2258 insertions(+), 2222 deletions(-) [+] |
line wrap: on
line diff
--- a/src/about.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/about.c Thu Sep 27 19:17:11 2001 +0000 @@ -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) rob@marko.net\nEric Warmenhoven (lead coder) warmenhoven@yahoo.com\n\nBenjamin Miller\nDecklin Foster\nJim Duchek\nMark Spencer (original author) markster@marko.net"), 198); - + gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL, + _("Rob Flynn (maintainer) rob@marko.net\nEric Warmenhoven (lead coder) warmenhoven@yahoo.com\n\nBenjamin Miller\nDecklin Foster\nJim Duchek\nMark Spencer (original author) markster@marko.net"), + 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);
--- a/src/aim.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/aim.c Thu Sep 27 19:17:11 2001 +0000 @@ -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);
--- a/src/applet.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/applet.c Thu Sep 27 19:17:11 2001 +0000 @@ -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_widget_init("GAIM", VERSION, argc, argv, NULL, 0, NULL); - 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); + /*init imlib for graphics */ + gdk_imlib_init(); + gtk_widget_push_visual(gdk_imlib_get_visual()); + gtk_widget_push_colormap(gdk_imlib_get_colormap()); - appletframe = gtk_frame_new(NULL); + 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 */
--- a/src/away.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/away.c Thu Sep 27 19:17:11 2001 +0000 @@ -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); + } else + while (msgs) { + awy = away_messages; - 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); + 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); - 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); + 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); + + while (awy) { + a = (struct away_message *)awy->data; - awy = g_slist_next(awy); + 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);
--- a/src/browser.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/browser.c Thu Sep 27 19:17:11 2001 +0000 @@ -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 */
--- a/src/buddy.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/buddy.c Thu Sep 27 19:17:11 2001 +0000 @@ -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 @@ static void update_num_group(struct group_show *gs); static void redo_buddy_list(); -void handle_group_rename(struct group *g, char* prevname) { +void handle_group_rename(struct group *g, char *prevname) +{ struct group_show *gs, *new_gs; struct buddy_show *bs; struct buddy *b; @@ -166,7 +167,7 @@ if ((bs = find_buddy_show(new_gs, b->name)) == NULL) { if (*g->gc->prpl->list_icon) { bs = new_buddy_show(new_gs, b, - (*g->gc->prpl->list_icon)(b->uc)); + (*g->gc->prpl->list_icon)(b->uc)); } else { bs = new_buddy_show(new_gs, b, (char **)no_icon_xpm); } @@ -193,8 +194,7 @@ * over to another group_show */ for (m = gs->members; m != NULL; m = g_slist_next(m)) { bs = (struct buddy_show *)m->data; - if (g_slist_index(bs->connlist, g->gc) < 0 || - g_slist_length(bs->connlist) > 1) { + if (g_slist_index(bs->connlist, g->gc) < 0 || g_slist_length(bs->connlist) > 1) { break; } } @@ -220,7 +220,7 @@ } if (*g->gc->prpl->list_icon) { bs = new_buddy_show(new_gs, b, - (*g->gc->prpl->list_icon)(b->uc)); + (*g->gc->prpl->list_icon)(b->uc)); } else { bs = new_buddy_show(new_gs, b, (char **)no_icon_xpm); } @@ -239,7 +239,8 @@ } } -void handle_buddy_rename(struct buddy *b, char *prevname) { +void handle_buddy_rename(struct buddy *b, char *prevname) +{ struct buddy_show *bs; struct group_show *gs; struct group *g; @@ -269,7 +270,7 @@ /* buddy's offline */ return; } - + if (g_strcasecmp(b->name, prevname)) { bs->connlist = g_slist_remove(bs->connlist, b->gc); if (!bs->connlist) { @@ -291,7 +292,7 @@ { if (blist) gtk_widget_destroy(blist); - blist=NULL; + blist = NULL; imchatbox = NULL; awaymenu = NULL; protomenu = NULL; @@ -299,13 +300,13 @@ static void adjust_pic(GtkWidget *button, const char *c, gchar **xpm) { - GdkPixmap *pm; - GdkBitmap *bm; - GtkWidget *pic; - GtkWidget *label; - - /*if the user had opted to put pictures on the buttons*/ - if (blist_options & OPT_BLIST_SHOW_BUTTON_XPM && xpm) { + GdkPixmap *pm; + GdkBitmap *bm; + GtkWidget *pic; + GtkWidget *label; + + /*if the user had opted to put pictures on the buttons */ + if (blist_options & OPT_BLIST_SHOW_BUTTON_XPM && xpm) { pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm); pic = gtk_pixmap_new(pm, bm); gtk_widget_show(pic); @@ -314,7 +315,7 @@ label = GTK_BIN(button)->child; gtk_container_remove(GTK_CONTAINER(button), label); gtk_container_add(GTK_CONTAINER(button), pic); - } else { + } else { label = gtk_label_new(c); gtk_widget_show(label); pic = GTK_BIN(button)->child; @@ -325,7 +326,8 @@ } -void toggle_show_empty_groups() { +void toggle_show_empty_groups() +{ if (blist_options & OPT_BLIST_NO_MT_GRP) { /* remove any group_shows with empty members */ GSList *s = shows; @@ -361,11 +363,12 @@ } c = g_slist_next(c); } - + } } -void toggle_buddy_pixmaps() { +void toggle_buddy_pixmaps() +{ GSList *s = shows; struct group_show *g; GSList *m; @@ -386,7 +389,8 @@ } } -static void update_num_group(struct group_show *gs) { +static void update_num_group(struct group_show *gs) +{ GSList *c = connections; struct gaim_connection *gc; struct group *g; @@ -423,7 +427,8 @@ gtk_label_set_text(GTK_LABEL(gs->label), buf); } -void update_num_groups() { +void update_num_groups() +{ GSList *s = shows; struct group_show *g; @@ -444,8 +449,8 @@ if (!(blist_options & OPT_BLIST_NO_BUTTONS)) { adjust_pic(awaybutton, _("Away"), (gchar **)away_big_xpm); adjust_pic(chatbutton, _("Chat"), (gchar **)join_xpm); - adjust_pic(imbutton, _("IM"), (gchar **)tmp_send_xpm); - adjust_pic(infobutton, _("Info"), (gchar **)tb_search_xpm); + adjust_pic(imbutton, _("IM"), (gchar **)tmp_send_xpm); + adjust_pic(infobutton, _("Info"), (gchar **)tb_search_xpm); } gtk_widget_hide(addbutton->parent); gtk_widget_show(addbutton->parent); @@ -458,7 +463,8 @@ #ifdef USE_APPLET -gint applet_destroy_buddy( GtkWidget *widget, GdkEvent *event,gpointer *data ) { +gint applet_destroy_buddy(GtkWidget *widget, GdkEvent *event, gpointer *data) +{ applet_buddy_show = FALSE; gtk_widget_hide(blist); return (TRUE); @@ -499,7 +505,8 @@ #endif update_connection_dependent_prefs(); - if (connections) return; + if (connections) + return; { GSList *s = shows; @@ -531,17 +538,17 @@ } debug_printf("date: %s\n", full_date()); - destroy_all_dialogs(); - destroy_buddy(); + destroy_all_dialogs(); + destroy_buddy(); #ifdef USE_APPLET set_user_state(offline); applet_buddy_show = FALSE; - applet_widget_unregister_callback(APPLET_WIDGET(applet),"signoff"); + applet_widget_unregister_callback(APPLET_WIDGET(applet), "signoff"); remove_applet_away(); #else - show_login(); + show_login(); #endif /* USE_APPLET */ - if ( misc_options & OPT_MISC_BUDDY_TICKER ) + if (misc_options & OPT_MISC_BUDDY_TICKER) BuddyTickerSignoff(); } @@ -586,7 +593,7 @@ } } -void pressed_log (GtkWidget *widget, char *name) +void pressed_log(GtkWidget *widget, char *name) { show_log(name); } @@ -632,16 +639,17 @@ void handle_click_buddy(GtkWidget *widget, GdkEventButton *event, struct buddy_show *b) { - if (!b->connlist) return; - if (event->type == GDK_2BUTTON_PRESS && event->button == 1) { - struct conversation *c; - - c = find_conversation(b->name); - - if (c != NULL) - gdk_window_show(c->window->window); - else - c = new_conversation(b->name); + if (!b->connlist) + return; + if (event->type == GDK_2BUTTON_PRESS && event->button == 1) { + struct conversation *c; + + c = find_conversation(b->name); + + if (c != NULL) + gdk_window_show(c->window->window); + else + c = new_conversation(b->name); set_convo_gc(c, b->connlist->data); if (im_options & OPT_IM_ONE_WINDOW) @@ -658,14 +666,12 @@ menu = gtk_menu_new(); button = gtk_menu_item_new_with_label(_("IM")); - gtk_signal_connect(GTK_OBJECT(button), "activate", - GTK_SIGNAL_FUNC(pressed_im), b); + gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_im), b); gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); button = gtk_menu_item_new_with_label(_("Alias")); - gtk_signal_connect(GTK_OBJECT(button), "activate", - GTK_SIGNAL_FUNC(pressed_alias_bs), b); + gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_alias_bs), b); gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); @@ -690,7 +696,7 @@ menuitem = gtk_menu_item_new_with_label(g->username); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); - + conmenu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), conmenu); gtk_widget_show(conmenu); @@ -733,24 +739,23 @@ } /* we send the menu widget so we can add menuitems within a plugin */ - plugin_event (event_draw_menu, menu, b->name, 0, 0); - - gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, - event->button, event->time); + plugin_event(event_draw_menu, menu, b->name, 0, 0); + + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time); } else if (event->type == GDK_3BUTTON_PRESS && event->button == 2) { - if (!g_strcasecmp("zilding", normalize(b->name))) - show_ee_dialog(0); - else if (!g_strcasecmp("robflynn", normalize(b->name))) - show_ee_dialog(1); - else if (!g_strcasecmp("flynorange", normalize(b->name))) - show_ee_dialog(2); - else if (!g_strcasecmp("ewarmenhoven", normalize(b->name))) - show_ee_dialog(3); + if (!g_strcasecmp("zilding", normalize (b->name))) + show_ee_dialog(0); + else if (!g_strcasecmp("robflynn", normalize (b->name))) + show_ee_dialog(1); + else if (!g_strcasecmp("flynorange", normalize (b->name))) + show_ee_dialog(2); + else if (!g_strcasecmp("ewarmenhoven", normalize (b->name))) + show_ee_dialog(3); } else { - - /* Anything for other buttons? :) */ + + /* Anything for other buttons? :) */ } } @@ -762,8 +767,10 @@ GtkCTreeNode *node = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, b); g_snprintf(b->show, sizeof(b->show), "%s", b->name); gtk_ctree_node_set_text(GTK_CTREE(edittree), node, 0, b->name); - if (gs) bs = find_buddy_show(gs, b->name); - if (bs) gtk_label_set(GTK_LABEL(bs->label), b->name); + if (gs) + bs = find_buddy_show(gs, b->name); + if (bs) + gtk_label_set(GTK_LABEL(bs->label), b->name); do_export(b->gc); } @@ -774,7 +781,7 @@ int row, column; GtkWidget *menu; GtkWidget *button; - + if (event->button != 3 || event->type != GDK_BUTTON_PRESS) return TRUE; @@ -793,15 +800,13 @@ gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); - gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, - event->button, event->time); + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time); } else if (*type == EDIT_BUDDY) { struct buddy *b = (struct buddy *)type; menu = gtk_menu_new(); button = gtk_menu_item_new_with_label(_("IM")); - gtk_signal_connect(GTK_OBJECT(button), "activate", - GTK_SIGNAL_FUNC(pressed_im_bud), b); + gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_im_bud), b); gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); @@ -813,12 +818,11 @@ if (strcmp(b->name, b->show)) { button = gtk_menu_item_new_with_label(_("Un-Alias")); - gtk_signal_connect(GTK_OBJECT(button), "activate", - GTK_SIGNAL_FUNC(un_alias), b); + gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(un_alias), b); gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); } - + button = gtk_menu_item_new_with_label(_("Rename")); gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(show_rename_buddy), b); @@ -837,8 +841,7 @@ gtk_menu_append(GTK_MENU(menu), button); gtk_widget_show(button); - gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, - event->button, event->time); + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time); } return TRUE; @@ -852,7 +855,7 @@ struct conversation *c; struct group_show *gs; struct buddy_show *bs; - + struct group *delg; struct buddy *delb; @@ -862,13 +865,13 @@ */ grp = g_slist_find(gc->groups, rem_g); - delg = (struct group *)grp->data; - mem = delg->members; - - mem = g_slist_find(mem, rem_b); - delb = (struct buddy *)mem->data; - - delg->members = g_slist_remove(delg->members, delb); + delg = (struct group *)grp->data; + mem = delg->members; + + mem = g_slist_find(mem, rem_b); + delb = (struct buddy *)mem->data; + + delg->members = g_slist_remove(delg->members, delb); gs = find_group_show(rem_g->name); if (gs) { @@ -886,7 +889,7 @@ g_free(bs->name); g_free(bs); if (!g_slist_length(gs->members) && - (blist_options & OPT_BLIST_NO_MT_GRP)) { + (blist_options & OPT_BLIST_NO_MT_GRP)) { shows = g_slist_remove(shows, gs); gtk_tree_remove_item(GTK_TREE(buddies), gs->item); g_free(gs->name); @@ -904,7 +907,7 @@ c = find_conversation(delb->name); if (c) update_buttons_by_protocol(c); - g_free(delb); + g_free(delb); /* we don't flush buddy list to cache because in the case of remove_group that would * mean writing to the buddy list file once for each buddy, plus one more time */ @@ -916,7 +919,7 @@ GSList *mem; struct group_show *gs; GList *tmp = NULL; - + struct group *delg; struct buddy *delb; @@ -924,14 +927,14 @@ * the UI is responsible for this */ grp = g_slist_find(gc->groups, rem_g); - delg = (struct group *)grp->data; - mem = delg->members; - - while(delg->members) { + delg = (struct group *)grp->data; + mem = delg->members; + + while (delg->members) { delb = (struct buddy *)delg->members->data; tmp = g_list_append(tmp, g_strdup(delb->name)); - remove_buddy(gc, delg, delb); /* this should take care of removing - the group_show if necessary */ + remove_buddy(gc, delg, delb); /* this should take care of removing + the group_show if necessary */ } gc->groups = g_slist_remove(gc->groups, delg); @@ -950,7 +953,7 @@ tmp = g_list_remove(tmp, tmp->data); } - /* don't flush buddy list to cache in order to be consistent with remove_buddy, + /* don't flush buddy list to cache in order to be consistent with remove_buddy, * mostly. remove_group is only called from one place, so we'll let it handle it. */ } @@ -958,13 +961,13 @@ -gboolean edit_drag_compare_func (GtkCTree *ctree, GtkCTreeNode *source_node, - GtkCTreeNode *new_parent, GtkCTreeNode *new_sibling) +gboolean edit_drag_compare_func(GtkCTree *ctree, GtkCTreeNode *source_node, + GtkCTreeNode *new_parent, GtkCTreeNode *new_sibling) { int *type; type = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(ctree), source_node); - + if (*type == EDIT_GC) { if (!new_parent) return TRUE; @@ -974,7 +977,8 @@ if (*type == EDIT_GROUP) return TRUE; } - } else /* group */ { + } else { /* group */ + if (g_slist_length(connections) > 1 && new_parent) { type = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(ctree), new_parent); if (*type == EDIT_GC) @@ -987,7 +991,8 @@ } -static void redo_buddy_list() { +static 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 * change connections, so we can assume that we don't have to change any user @@ -1009,7 +1014,8 @@ struct group *g; struct buddy *b; - if (!blist) return; + if (!blist) + return; while (s) { gs = (struct group_show *)s->data; @@ -1050,7 +1056,8 @@ if (!bs) { if (gc->prpl->list_icon) bs = new_buddy_show(gs, b, - (*gc->prpl->list_icon)(b->uc)); + (*gc->prpl->list_icon)(b-> + uc)); else bs = new_buddy_show(gs, b, (char **)no_icon_xpm); } @@ -1061,14 +1068,14 @@ } } -static void edit_tree_move (GtkCTree *ctree, GtkCTreeNode *child, GtkCTreeNode *parent, - GtkCTreeNode *sibling, gpointer data) +static void edit_tree_move(GtkCTree *ctree, GtkCTreeNode *child, GtkCTreeNode *parent, + GtkCTreeNode *sibling, gpointer data) { struct gaim_connection *gc, *pc = NULL, *sc = NULL; int *ctype, *ptype = NULL, *stype = NULL; - + ctype = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(ctree), child); - + if (parent) ptype = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(ctree), parent); @@ -1138,7 +1145,8 @@ do_export(new_g->gc); build_edit_tree(); } - } else /* group */ { + } else { /* group */ + /* move the group. if moving connections, copy the group, and each buddy in the * group. if the buddy exists in the new connection, leave it where it is. */ @@ -1206,7 +1214,7 @@ void build_edit_tree() { - GtkCTreeNode *c = NULL, *p = NULL, *n; + GtkCTreeNode *c = NULL, *p = NULL, *n; GSList *con = connections; GSList *grp; GSList *mem; @@ -1215,12 +1223,13 @@ struct buddy *b; char *text[1]; - if (!blist) return; + if (!blist) + return; gtk_clist_freeze(GTK_CLIST(edittree)); gtk_clist_clear(GTK_CLIST(edittree)); - - + + while (con) { z = (struct gaim_connection *)con->data; @@ -1228,8 +1237,7 @@ text[0] = z->username; c = gtk_ctree_insert_node(GTK_CTREE(edittree), NULL, - NULL, text, 5, NULL, NULL, - NULL, NULL, 0, 1); + NULL, text, 5, NULL, NULL, NULL, NULL, 0, 1); gtk_ctree_node_set_row_data(GTK_CTREE(edittree), c, z); } else @@ -1237,22 +1245,21 @@ grp = z->groups; - while(grp) { + while (grp) { g = (struct group *)grp->data; text[0] = g->name; - + p = gtk_ctree_insert_node(GTK_CTREE(edittree), c, - NULL, text, 5, NULL, NULL, - NULL, NULL, 0, 1); + NULL, text, 5, NULL, NULL, NULL, NULL, 0, 1); gtk_ctree_node_set_row_data(GTK_CTREE(edittree), p, g); n = NULL; - + mem = g->members; - while(mem) { + while (mem) { char buf[256]; b = (struct buddy *)mem->data; if (strcmp(b->name, b->show)) { @@ -1263,13 +1270,12 @@ n = gtk_ctree_insert_node(GTK_CTREE(edittree), p, NULL, text, 5, - NULL, NULL, - NULL, NULL, 1, 1); + NULL, NULL, NULL, NULL, 1, 1); gtk_ctree_node_set_row_data(GTK_CTREE(edittree), n, b); mem = mem->next; - + } grp = g_slist_next(grp); } @@ -1277,12 +1283,12 @@ } gtk_clist_thaw(GTK_CLIST(edittree)); - + } struct buddy *add_buddy(struct gaim_connection *gc, char *group, char *buddy, char *show) { - GtkCTreeNode *p = NULL, *n; + GtkCTreeNode *p = NULL, *n; char *text[1]; char buf[256]; struct buddy *b; @@ -1291,15 +1297,15 @@ char *good; if ((b = find_buddy(gc, buddy)) != NULL) - return b; + return b; g = find_group(gc, group); if (g == NULL) g = add_group(gc, group); - - b = (struct buddy *)g_new0(struct buddy, 1); - + + b = (struct buddy *)g_new0(struct buddy, 1); + if (!b) return NULL; @@ -1314,15 +1320,17 @@ g_snprintf(b->name, sizeof(b->name), "%s", good); g_snprintf(b->show, sizeof(b->show), "%s", show ? (show[0] ? show : good) : good); - - g->members = g_slist_append(g->members, b); - - b->idle = 0; + + g->members = g_slist_append(g->members, b); + + b->idle = 0; b->caps = 0; - if (gs) update_num_group(gs); - - if (!blist) return b; + if (gs) + update_num_group(gs); + + if (!blist) + return b; p = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, g); if (strcmp(b->name, b->show)) { @@ -1331,17 +1339,16 @@ } else text[0] = b->name; - n = gtk_ctree_insert_node(GTK_CTREE(edittree), p, NULL, text, 5, - NULL, NULL, NULL, NULL, 1, 1); + n = gtk_ctree_insert_node(GTK_CTREE(edittree), p, NULL, text, 5, NULL, NULL, NULL, NULL, 1, 1); gtk_ctree_node_set_row_data(GTK_CTREE(edittree), n, b); - + return b; } struct group *add_group(struct gaim_connection *gc, char *group) { - GtkCTreeNode *c = NULL, *p; + GtkCTreeNode *c = NULL, *p; char *text[1]; struct group *g = find_group(gc, group); if (g) @@ -1353,19 +1360,18 @@ g->edittype = EDIT_GROUP; g->gc = gc; strncpy(g->name, group, sizeof(g->name)); - gc->groups = g_slist_append(gc->groups, g); + gc->groups = g_slist_append(gc->groups, g); g->members = NULL; - - if (!blist) return g; + + if (!blist) + return g; c = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, gc); text[0] = g->name; - p = gtk_ctree_insert_node(GTK_CTREE(edittree), c, - NULL, text, 5, NULL, NULL, - NULL, NULL, 0, 1); + p = gtk_ctree_insert_node(GTK_CTREE(edittree), c, NULL, text, 5, NULL, NULL, NULL, NULL, 0, 1); gtk_ctree_node_set_row_data(GTK_CTREE(edittree), p, g); - + if (!(blist_options & OPT_BLIST_NO_MT_GRP) && !find_group_show(group)) new_group_show(group); @@ -1380,7 +1386,7 @@ struct group *g; int *type; GList *i; - + i = GTK_CLIST(edittree)->selection; if (i) { node = i->data; @@ -1400,17 +1406,17 @@ remove_group(gc, (struct group *)type); gtk_ctree_remove_node(GTK_CTREE(edittree), node); do_export(gc); - } - - } else { - /* Nothing selected. */ - } + } + + } else { + /* Nothing selected. */ + } } void import_callback(GtkWidget *widget, void *null) { - show_import_dialog(); + show_import_dialog(); } void do_quit() @@ -1493,22 +1499,22 @@ i = GTK_TREE_SELECTION(tree); if (i) { b = gtk_object_get_user_data(GTK_OBJECT(i->data)); - } + } if (!i || !b) { show_im_dialog(); return; - } + } if (!b->name) return; - c = find_conversation(b->name); + c = find_conversation(b->name); if (c == NULL) { c = new_conversation(b->name); } else { gdk_window_raise(c->window->window); } } - + static void info_callback(GtkWidget *widget, GtkTree *tree) { @@ -1517,11 +1523,11 @@ i = GTK_TREE_SELECTION(tree); if (i) { b = gtk_object_get_user_data(GTK_OBJECT(i->data)); - } + } if (!i || !b) { show_info_dialog(); return; - } + } if (!b->name) return; if (b->connlist) @@ -1563,34 +1569,34 @@ struct group *find_group(struct gaim_connection *gc, char *group) { struct group *g; - GSList *grp; + GSList *grp; GSList *c = connections; struct gaim_connection *z; char *grpname = g_malloc(strlen(group) + 1); - strcpy(grpname, normalize(group)); + strcpy(grpname, normalize (group)); if (gc) { grp = gc->groups; while (grp) { g = (struct group *)grp->data; - if (!g_strcasecmp(normalize(g->name), grpname)) { - g_free(grpname); - return g; + if (!g_strcasecmp(normalize (g->name), grpname)) { + g_free(grpname); + return g; } grp = g_slist_next(grp); } g_free(grpname); - return NULL; + return NULL; } else { - while(c) { + while (c) { z = (struct gaim_connection *)c->data; grp = z->groups; while (grp) { g = (struct group *)grp->data; - if (!g_strcasecmp(normalize(g->name), grpname)) { - g_free(grpname); - return g; + if (!g_strcasecmp(normalize (g->name), grpname)) { + g_free(grpname); + return g; } grp = g_slist_next(grp); } @@ -1619,11 +1625,11 @@ norm = normalize; whoname = g_strdup((*norm)(who)); grp = gc->groups; - while(grp) { + while (grp) { g = (struct group *)grp->data; mem = g->members; - while(mem) { + while (mem) { b = (struct buddy *)mem->data; if (!strcmp((*norm)(b->name), whoname)) { g_free(whoname); @@ -1646,11 +1652,11 @@ norm = normalize; whoname = g_strdup((*norm)(who)); grp = z->groups; - while(grp) { + while (grp) { g = (struct group *)grp->data; mem = g->members; - while(mem) { + while (mem) { b = (struct buddy *)mem->data; if (!strcmp((*norm)(b->name), whoname)) { g_free(whoname); @@ -1686,11 +1692,11 @@ norm = normalize; whoname = g_strdup((*norm)(who)); grp = gc->groups; - while(grp) { + while (grp) { g = (struct group *)grp->data; mem = g->members; - while(mem) { + while (mem) { b = (struct buddy *)mem->data; if (!strcmp((*norm)(b->name), whoname)) { g_free(whoname); @@ -1712,11 +1718,11 @@ norm = normalize; whoname = g_strdup((*norm)(who)); grp = z->groups; - while(grp) { + while (grp) { g = (struct group *)grp->data; mem = g->members; - while(mem) { + while (mem) { b = (struct buddy *)mem->data; if (!strcmp((*norm)(b->name), whoname)) { g_free(whoname); @@ -1743,45 +1749,48 @@ void do_pounce(struct gaim_connection *gc, char *name, int when) { - char *who; - - struct buddy_pounce *b; + char *who; + + struct buddy_pounce *b; struct conversation *c; struct aim_user *u; GList *bp = buddy_pounces; - - who = g_strdup(normalize(name)); + + who = g_strdup(normalize (name)); while (bp) { b = (struct buddy_pounce *)bp->data; - bp = bp->next; /* increment the list here because rem_bp can make our handle bad */ - - if (!(b->options & when)) continue; - - u = find_user(b->pouncer, b->protocol); /* find our user */ - if (u == NULL) continue; + bp = bp->next; /* increment the list here because rem_bp can make our handle bad */ + + if (!(b->options & when)) + continue; + + u = find_user(b->pouncer, b->protocol); /* find our user */ + if (u == NULL) + continue; /* check and see if we're signed on as the pouncer */ - if (u->gc != gc) continue; - - if (!g_strcasecmp(who, normalize(b->name))) { /* find someone to pounce */ + if (u->gc != gc) + continue; + + if (!g_strcasecmp(who, normalize (b->name))) { /* find someone to pounce */ if (b->options & OPT_POUNCE_POPUP) { c = find_conversation(name); if (c == NULL) - c = new_conversation(name); + c = new_conversation(name); set_convo_gc(c, u->gc); } if (b->options & OPT_POUNCE_SEND_IM) { - c = find_conversation(name); - if (c == NULL) - c = new_conversation(name); + c = find_conversation(name); + if (c == NULL) + c = new_conversation(name); set_convo_gc(c, u->gc); - write_to_conv(c, b->message, WFLAG_SEND, NULL, time((time_t)NULL)); - serv_send_im(u->gc, name, b->message, 0); + write_to_conv(c, b->message, WFLAG_SEND, NULL, time((time_t) NULL)); + serv_send_im(u->gc, name, b->message, 0); } if (b->options & OPT_POUNCE_COMMAND) { int pid = fork(); @@ -1799,51 +1808,51 @@ } } if (b->options & OPT_POUNCE_SOUND) { - if(strlen(b->sound)) + if (strlen(b->sound)) play_file(b->sound); else play_sound(POUNCE_DEFAULT); } - + if (!(b->options & OPT_POUNCE_SAVE)) rem_bp(NULL, b); - - } - } - g_free(who); + + } + } + g_free(who); } static void new_bp_callback(GtkWidget *w, char *name) { - show_new_bp(name); + show_new_bp(name); } void do_bp_menu() { GtkWidget *menuitem, *mess, *messmenu; static GtkWidget *remmenu; - GtkWidget *remitem; - GtkWidget *sep; + GtkWidget *remitem; + GtkWidget *sep; GList *l; struct buddy_pounce *b; GList *bp = buddy_pounces; - + l = gtk_container_children(GTK_CONTAINER(bpmenu)); - - while(l) { + + while (l) { gtk_widget_destroy(GTK_WIDGET(l->data)); l = l->next; } remmenu = gtk_menu_new(); - + menuitem = gtk_menu_item_new_with_label(_("New Buddy Pounce")); gtk_menu_append(GTK_MENU(bpmenu), menuitem); gtk_widget_show(menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(new_bp_callback), NULL); - while(bp) { + while (bp) { b = (struct buddy_pounce *)bp->data; remitem = gtk_menu_item_new_with_label(b->name); @@ -1854,14 +1863,14 @@ bp = bp->next; } - + menuitem = gtk_menu_item_new_with_label(_("Remove Buddy Pounce")); gtk_menu_append(GTK_MENU(bpmenu), menuitem); gtk_widget_show(menuitem); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), remmenu); - gtk_widget_show(remmenu); - - sep = gtk_hseparator_new(); + gtk_widget_show(remmenu); + + sep = gtk_hseparator_new(); menuitem = gtk_menu_item_new(); gtk_menu_append(GTK_MENU(bpmenu), menuitem); gtk_container_add(GTK_CONTAINER(menuitem), sep); @@ -1870,37 +1879,38 @@ gtk_widget_show(sep); bp = buddy_pounces; - - while(bp) { - - b = (struct buddy_pounce *)bp->data; - + + while (bp) { + + b = (struct buddy_pounce *)bp->data; + menuitem = gtk_menu_item_new_with_label(b->name); gtk_menu_append(GTK_MENU(bpmenu), menuitem); - messmenu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), messmenu); - gtk_widget_show(menuitem); - - mess = gtk_menu_item_new_with_label(b->message); - gtk_menu_append(GTK_MENU(messmenu), mess); - gtk_widget_show(mess); - - bp = bp->next; + messmenu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), messmenu); + gtk_widget_show(menuitem); + + mess = gtk_menu_item_new_with_label(b->message); + gtk_menu_append(GTK_MENU(messmenu), mess); + gtk_widget_show(mess); + + bp = bp->next; } } -static struct group_show *find_group_show(char *group) { +static struct group_show *find_group_show(char *group) +{ GSList *m = shows; struct group_show *g = NULL; - char *who = g_strdup(normalize(group)); + char *who = g_strdup(normalize (group)); while (m) { g = (struct group_show *)m->data; - if (!g_strcasecmp(normalize(g->name), who)) - break; + if (!g_strcasecmp(normalize (g->name), who)) + break; g = NULL; m = m->next; } @@ -1909,15 +1919,16 @@ return g; } -static struct buddy_show *find_buddy_show(struct group_show *gs, char *name) { +static struct buddy_show *find_buddy_show(struct group_show *gs, char *name) +{ GSList *m = gs->members; struct buddy_show *b = NULL; - char *who = g_strdup(normalize(name)); + char *who = g_strdup(normalize (name)); while (m) { b = (struct buddy_show *)m->data; - if (!g_strcasecmp(normalize(b->name), who)) - break; + if (!g_strcasecmp(normalize (b->name), who)) + break; b = NULL; m = m->next; } @@ -1926,7 +1937,8 @@ return b; } -static int group_number(char *group) { +static int group_number(char *group) +{ GSList *c = connections; struct gaim_connection *g; GSList *m; @@ -1950,14 +1962,15 @@ return -1; } -static int buddy_number(char *group, char *buddy) { +static int buddy_number(char *group, char *buddy) +{ GSList *c = connections; struct gaim_connection *g; struct group *p; GSList *z; struct buddy *b; int pos = 0; - char *tmp1 = g_strdup(normalize(buddy)); + char *tmp1 = g_strdup(normalize (buddy)); struct group_show *gs = find_group_show(group); while (c) { @@ -1970,7 +1983,7 @@ z = p->members; while (z) { b = (struct buddy *)z->data; - if (!strcmp(tmp1, normalize(b->name))) { + if (!strcmp(tmp1, normalize (b->name))) { g_free(tmp1); return pos; } @@ -1986,7 +1999,8 @@ return -1; } -static struct group_show *new_group_show(char *group) { +static struct group_show *new_group_show(char *group) +{ struct group_show *g = g_new0(struct group_show, 1); int pos = group_number(group); @@ -2008,7 +2022,8 @@ return g; } -static struct buddy_show *new_buddy_show(struct group_show *gs, struct buddy *buddy, char **xpm) { +static struct buddy_show *new_buddy_show(struct group_show *gs, struct buddy *buddy, char **xpm) +{ struct buddy_show *b = g_new0(struct buddy_show, 1); GtkWidget *box; GdkPixmap *pm; @@ -2064,7 +2079,8 @@ return b; } -static void remove_buddy_show(struct group_show *gs, struct buddy_show *bs) { +static void remove_buddy_show(struct group_show *gs, struct buddy_show *bs) +{ /* the name of this function may be misleading, but don't let it fool you. the point * of this is to remove bs->item from gs->tree, and make sure gs->tree still exists * and is a valid tree afterwards. Otherwise, Bad Things will happen. */ @@ -2072,7 +2088,8 @@ bs->item = NULL; } -static struct group_show *find_gs_by_bs(struct buddy_show *b) { +static struct group_show *find_gs_by_bs(struct buddy_show *b) +{ GSList *m, *n; struct group_show *g = NULL; struct buddy_show *h; @@ -2094,7 +2111,8 @@ return g; } -static gint log_timeout(struct buddy_show *b) { +static gint log_timeout(struct buddy_show *b) +{ /* this part is really just a bad hack because of a bug I can't find */ GSList *s = shows; while (s) { @@ -2139,7 +2157,8 @@ gchar **xpm = NULL; struct buddy *light = find_buddy(b->connlist->data, b->name); if (((struct gaim_connection *)b->connlist->data)->prpl->list_icon) - xpm = (*((struct gaim_connection *)b->connlist->data)->prpl->list_icon)(light->uc); + xpm = + (*((struct gaim_connection *)b->connlist->data)->prpl->list_icon)(light->uc); if (xpm == NULL) xpm = (char **)no_icon_xpm; pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm); @@ -2167,36 +2186,37 @@ while (bit <= 0x80) { if (bit & caps) { switch (bit) { - case 0x1: - tmp = _("Buddy Icon"); - break; - case 0x2: - tmp = _("Voice"); - break; - case 0x4: - tmp = _("IM Image"); - break; - case 0x8: - tmp = _("Chat"); - break; - case 0x10: - tmp = _("Get File"); - break; - case 0x20: - tmp = _("Send File"); - break; - case 0x40: - tmp = _("Games"); - break; - case 0x80: - tmp = _("Stocks"); - break; - default: - tmp = NULL; - break; + case 0x1: + tmp = _("Buddy Icon"); + break; + case 0x2: + tmp = _("Voice"); + break; + case 0x4: + tmp = _("IM Image"); + break; + case 0x8: + tmp = _("Chat"); + break; + case 0x10: + tmp = _("Get File"); + break; + case 0x20: + tmp = _("Send File"); + break; + case 0x40: + tmp = _("Games"); + break; + case 0x80: + tmp = _("Stocks"); + break; + default: + tmp = NULL; + break; } if (tmp) - i += g_snprintf(buf+i, sizeof(buf)-i, "%s%s", (count ? ", " : ""), tmp); + i += g_snprintf(buf + i, sizeof(buf) - i, "%s%s", (count ? ", " : ""), + tmp); count++; } bit <<= 1; @@ -2206,7 +2226,8 @@ /* for this we're just going to assume the first connection that registered the buddy. * if it's not the one you were hoping for then you're shit out of luck */ -static void update_idle_time(struct buddy_show *bs) { +static void update_idle_time(struct buddy_show *bs) +{ /* this also updates the tooltip since that has idle time in it */ char idlet[16], warnl[16]; time_t t; @@ -2219,10 +2240,13 @@ char *sotime = NULL, *itime; time(&t); - if (!bs->connlist) return; + if (!bs->connlist) + return; b = find_buddy(bs->connlist->data, bs->name); - if (!b) return; - ihrs = (t - b->idle) / 3600; imin = ((t - b->idle) / 60) % 60; + if (!b) + return; + ihrs = (t - b->idle) / 3600; + imin = ((t - b->idle) / 60) % 60; if (ihrs) g_snprintf(idlet, sizeof idlet, "(%d:%02d)", ihrs, imin); @@ -2240,7 +2264,8 @@ /* now we do the tooltip */ if (b->signon) { char *stime = sec_to_text(t - b->signon + - ((struct gaim_connection *)bs->connlist->data)->correction_time); + ((struct gaim_connection *)bs->connlist->data)-> + correction_time); sotime = g_strdup_printf(_("Logged in: %s\n"), stime); g_free(stime); } @@ -2248,7 +2273,8 @@ if (b->idle) itime = sec_to_text(t - b->idle); else { - itime = g_malloc(1); itime[0] = 0; + itime = g_malloc(1); + itime[0] = 0; } if (b->evil) { @@ -2269,11 +2295,10 @@ caps[0] = '\0'; g_snprintf(infotip, sizeof infotip, _("Alias: %s \nScreen Name: %s\n" - "%s%s%s%s%s%s"), - b->show, b->name, - (b->signon ? sotime : ""), warn, - (b->idle ? _("Idle: ") : ""), itime, - (b->idle ? "\n" : ""), caps); + "%s%s%s%s%s%s"), + b->show, b->name, + (b->signon ? sotime : ""), warn, + (b->idle ? _("Idle: ") : ""), itime, (b->idle ? "\n" : ""), caps); gtk_tooltips_set_tip(tips, GTK_WIDGET(bs->item), infotip, ""); @@ -2282,7 +2307,8 @@ g_free(itime); } -void update_idle_times() { +void update_idle_times() +{ GSList *grp = shows; GSList *mem; struct buddy_show *b; @@ -2309,7 +2335,8 @@ GdkBitmap *bm; char **xpm = NULL; - if (!blist) return; + if (!blist) + return; if (b->present) { if ((gs = find_group_show(g->name)) == NULL) @@ -2322,7 +2349,7 @@ if (bs->sound != 2) play_sound(BUDDY_ARRIVE); pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, - NULL, (char **)login_icon_xpm); + NULL, (char **)login_icon_xpm); gtk_widget_hide(bs->pix); gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm); gtk_widget_show(bs->pix); @@ -2342,7 +2369,7 @@ if (c) { char tmp[1024]; g_snprintf(tmp, sizeof(tmp), _("%s logged in."), b->name); - write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time((time_t)NULL)); + write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time((time_t) NULL)); } } bs->sound = 2; @@ -2365,12 +2392,15 @@ update_idle_time(bs); } else { gs = find_group_show(g->name); - if (!gs) return; + if (!gs) + return; bs = find_buddy_show(gs, b->name); - if (!bs) return; - if (!bs->connlist) return; /* we won't do signoff updates for - buddies that have already signed - off */ + if (!bs) + return; + if (!bs->connlist) + return; /* we won't do signoff updates for + buddies that have already signed + off */ if (bs->sound != 1) play_sound(BUDDY_LEAVE); @@ -2394,7 +2424,7 @@ if (c) { char tmp[1024]; g_snprintf(tmp, sizeof(tmp), _("%s logged out."), b->name); - write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time((time_t)NULL)); + write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time((time_t) NULL)); } } @@ -2405,28 +2435,28 @@ static void move_blist_window(GtkWidget *w, GdkEventConfigure *e, void *dummy) { - int x, y, width, height; - int save = 0; - gdk_window_get_position(blist->window, &x, &y); - gdk_window_get_size(blist->window, &width, &height); - - if(e->send_event) { /* Is a position event */ - if (blist_pos.x != x || blist_pos.y != y) - save = 1; - blist_pos.x = x; - blist_pos.y = y; - } else { /* Is a size event */ - if (blist_pos.xoff != x || blist_pos.yoff != y || blist_pos.width != width) - save = 1; - - blist_pos.width = width; - blist_pos.height = height; + int x, y, width, height; + int save = 0; + gdk_window_get_position(blist->window, &x, &y); + gdk_window_get_size(blist->window, &width, &height); + + if (e->send_event) { /* Is a position event */ + if (blist_pos.x != x || blist_pos.y != y) + save = 1; + blist_pos.x = x; + blist_pos.y = y; + } else { /* Is a size event */ + if (blist_pos.xoff != x || blist_pos.yoff != y || blist_pos.width != width) + save = 1; + + blist_pos.width = width; + blist_pos.height = height; blist_pos.xoff = x; blist_pos.yoff = y; - } - - if (save) - save_prefs(); + } + + if (save) + save_prefs(); } @@ -2455,7 +2485,7 @@ GtkWidget *label; menuitem = gtk_menu_item_new(); - if (menu) + if (menu) gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); @@ -2465,14 +2495,14 @@ gtk_widget_show(label); gtk_widget_add_accelerator(menuitem, "activate-item", accel, str[0], - GDK_MOD1_MASK, GTK_ACCEL_LOCKED); + GDK_MOD1_MASK, GTK_ACCEL_LOCKED); gtk_widget_lock_accelerators(menuitem); return menuitem; } GtkWidget *gaim_new_item_with_pixmap(GtkWidget *menu, const char *str, char **xpm, GtkSignalFunc sf, - guint accel_key, guint accel_mods, char *mod) + guint accel_key, guint accel_mods, char *mod) { GtkWidget *menuitem; GtkWidget *hbox; @@ -2482,7 +2512,7 @@ GdkBitmap *mask; menuitem = gtk_menu_item_new(); - if (menu) + if (menu) gtk_menu_append(GTK_MENU(menu), menuitem); if (sf) /* passing 1 is necessary so if we sign off closing the account editor doesn't exit */ @@ -2516,7 +2546,7 @@ if (accel_key) { gtk_widget_add_accelerator(menuitem, "activate", accel, accel_key, - accel_mods, GTK_ACCEL_LOCKED); + accel_mods, GTK_ACCEL_LOCKED); gtk_widget_lock_accelerators(menuitem); } @@ -2528,17 +2558,17 @@ void build_imchat_box(gboolean on) { if (on) { - if (imchatbox) return; - - imbutton = gtk_button_new_with_label(_("IM")); + if (imchatbox) + return; + + imbutton = gtk_button_new_with_label(_("IM")); infobutton = gtk_button_new_with_label(_("Info")); chatbutton = gtk_button_new_with_label(_("Chat")); awaybutton = gtk_button_new_with_label(_("Away")); - imchatbox = gtk_hbox_new(TRUE, 10); - - if (misc_options & OPT_MISC_COOL_LOOK) - { + imchatbox = gtk_hbox_new(TRUE, 10); + + if (misc_options & OPT_MISC_COOL_LOOK) { gtk_button_set_relief(GTK_BUTTON(imbutton), GTK_RELIEF_NONE); gtk_button_set_relief(GTK_BUTTON(infobutton), GTK_RELIEF_NONE); gtk_button_set_relief(GTK_BUTTON(chatbutton), GTK_RELIEF_NONE); @@ -2557,15 +2587,19 @@ gtk_box_pack_start(GTK_BOX(imchatbox), awaybutton, TRUE, TRUE, 0); gtk_container_border_width(GTK_CONTAINER(imchatbox), 5); - gtk_signal_connect(GTK_OBJECT(imbutton), "clicked", GTK_SIGNAL_FUNC(im_callback), buddies); - gtk_signal_connect(GTK_OBJECT(infobutton), "clicked", GTK_SIGNAL_FUNC(info_callback), buddies); - gtk_signal_connect(GTK_OBJECT(chatbutton), "clicked", GTK_SIGNAL_FUNC(chat_callback), buddies); - gtk_signal_connect(GTK_OBJECT(awaybutton), "clicked", GTK_SIGNAL_FUNC(away_callback), buddies); - - gtk_tooltips_set_tip(tips,infobutton, _("Information on selected Buddy"), "Penguin"); - gtk_tooltips_set_tip(tips,imbutton, _("Send Instant Message"), "Penguin"); - gtk_tooltips_set_tip(tips,chatbutton, _("Start/join a Buddy Chat"), "Penguin"); - gtk_tooltips_set_tip(tips,awaybutton, _("Activate Away Message"), "Penguin"); + gtk_signal_connect(GTK_OBJECT(imbutton), "clicked", GTK_SIGNAL_FUNC(im_callback), + buddies); + gtk_signal_connect(GTK_OBJECT(infobutton), "clicked", GTK_SIGNAL_FUNC(info_callback), + buddies); + gtk_signal_connect(GTK_OBJECT(chatbutton), "clicked", GTK_SIGNAL_FUNC(chat_callback), + buddies); + gtk_signal_connect(GTK_OBJECT(awaybutton), "clicked", GTK_SIGNAL_FUNC(away_callback), + buddies); + + gtk_tooltips_set_tip(tips, infobutton, _("Information on selected Buddy"), "Penguin"); + gtk_tooltips_set_tip(tips, imbutton, _("Send Instant Message"), "Penguin"); + gtk_tooltips_set_tip(tips, chatbutton, _("Start/join a Buddy Chat"), "Penguin"); + gtk_tooltips_set_tip(tips, awaybutton, _("Activate Away Message"), "Penguin"); gtk_box_pack_start(GTK_BOX(buddypane), imchatbox, FALSE, FALSE, 0); @@ -2581,9 +2615,9 @@ void show_buddy_list() { - + /* Build the buddy list, based on *config */ - + GtkWidget *sw; GtkWidget *menu; #ifdef USE_PERL @@ -2596,35 +2630,34 @@ GtkWidget *menubar; GtkWidget *vbox; GtkWidget *menuitem; - GtkWidget *notebook; - GtkWidget *label; - GtkWidget *bbox; - GtkWidget *tbox; + GtkWidget *notebook; + GtkWidget *label; + GtkWidget *bbox; + GtkWidget *tbox; if (blist) { gtk_widget_show(blist); return; } - #ifdef USE_APPLET - blist = gtk_window_new(GTK_WINDOW_DIALOG); + blist = gtk_window_new(GTK_WINDOW_DIALOG); #else - blist = gtk_window_new(GTK_WINDOW_TOPLEVEL); + blist = gtk_window_new(GTK_WINDOW_TOPLEVEL); #endif - - gtk_window_set_wmclass(GTK_WINDOW(blist), "buddy_list", "Gaim" ); + + gtk_window_set_wmclass(GTK_WINDOW(blist), "buddy_list", "Gaim"); gtk_widget_realize(blist); - aol_icon(blist->window); - - gtk_window_set_policy(GTK_WINDOW(blist), TRUE, TRUE, TRUE); + aol_icon(blist->window); + + gtk_window_set_policy(GTK_WINDOW(blist), TRUE, TRUE, TRUE); accel = gtk_accel_group_new(); gtk_accel_group_attach(accel, GTK_OBJECT(blist)); - + menubar = gtk_menu_bar_new(); - + menu = gtk_menu_new(); gtk_menu_set_accel_group(GTK_MENU(menu), accel); @@ -2634,28 +2667,28 @@ gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem); gaim_new_item_with_pixmap(menu, _("Add A Buddy"), add_small_xpm, - GTK_SIGNAL_FUNC(add_buddy_callback), 'b', GDK_CONTROL_MASK, "Ctl+B"); + GTK_SIGNAL_FUNC(add_buddy_callback), 'b', GDK_CONTROL_MASK, "Ctl+B"); gaim_new_item_with_pixmap(menu, _("Join A Chat"), pounce_small_xpm, - GTK_SIGNAL_FUNC(chat_callback), 'c', GDK_CONTROL_MASK, "Ctl+C"); + GTK_SIGNAL_FUNC(chat_callback), 'c', GDK_CONTROL_MASK, "Ctl+C"); gaim_new_item_with_pixmap(menu, _("New Instant Message"), send_small_xpm, - GTK_SIGNAL_FUNC(show_im_dialog), 'i', GDK_CONTROL_MASK, "Ctl+I"); - - gaim_separator(menu); - - gaim_new_item_with_pixmap(menu, _("Import Buddy List"), import_small_xpm, - GTK_SIGNAL_FUNC(import_callback), 0, 0, 0); - /*gaim_new_item_with_pixmap(menu, _("Export Buddy List"), export_small_xpm, - GTK_SIGNAL_FUNC(show_export_dialog), 0, 0, 0);*/ + GTK_SIGNAL_FUNC(show_im_dialog), 'i', GDK_CONTROL_MASK, "Ctl+I"); + + gaim_separator(menu); + + gaim_new_item_with_pixmap(menu, _("Import Buddy List"), import_small_xpm, + GTK_SIGNAL_FUNC(import_callback), 0, 0, 0); + /*gaim_new_item_with_pixmap(menu, _("Export Buddy List"), export_small_xpm, + GTK_SIGNAL_FUNC(show_export_dialog), 0, 0, 0); */ gaim_separator(menu); gaim_new_item_with_pixmap(menu, _("Signoff"), logout_icon_xpm, - GTK_SIGNAL_FUNC(signoff_all), 'd', GDK_CONTROL_MASK, "Ctl+D"); + GTK_SIGNAL_FUNC(signoff_all), 'd', GDK_CONTROL_MASK, "Ctl+D"); #ifndef USE_APPLET gaim_new_item_with_pixmap(menu, _("Quit"), exit_small_xpm, - GTK_SIGNAL_FUNC(do_quit), 'q', GDK_CONTROL_MASK, "Ctl+Q"); + GTK_SIGNAL_FUNC(do_quit), 'q', GDK_CONTROL_MASK, "Ctl+Q"); #else gaim_new_item_with_pixmap(menu, _("Close"), close_small_xpm, - GTK_SIGNAL_FUNC(applet_destroy_buddy), 'x', GDK_CONTROL_MASK, "Ctl+X"); + GTK_SIGNAL_FUNC(applet_destroy_buddy), 'x', GDK_CONTROL_MASK, "Ctl+X"); #endif menu = gtk_menu_new(); @@ -2667,20 +2700,20 @@ awaymenu = gtk_menu_new(); menuitem = gaim_new_item_with_pixmap(menu, _("Away"), away_small_xpm, NULL, 0, 0, 0); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), awaymenu); - do_away_menu(); - - bpmenu = gtk_menu_new(); - menuitem = gaim_new_item_with_pixmap(menu, _("Buddy Pounce"), pounce_small_xpm, NULL, 0, 0, 0); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), bpmenu); - do_bp_menu(); - - gaim_separator(menu); + do_away_menu(); + + bpmenu = gtk_menu_new(); + menuitem = gaim_new_item_with_pixmap(menu, _("Buddy Pounce"), pounce_small_xpm, NULL, 0, 0, 0); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), bpmenu); + do_bp_menu(); + + gaim_separator(menu); #ifdef NO_MULTI findmenu = gtk_menu_new(); gtk_widget_show(findmenu); menuitem = gaim_new_item_with_pixmap(menu, _("Search for Buddy"), search_small_xpm, - NULL, 0, 0, 0); + NULL, 0, 0, 0); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), findmenu); gtk_widget_show(menuitem); menuitem = gtk_menu_item_new_with_label(_("by Email")); @@ -2690,7 +2723,7 @@ menuitem = gtk_menu_item_new_with_label(_("by Dir Info")); gtk_menu_append(GTK_MENU(findmenu), menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(show_find_info), NULL); - gtk_widget_show(menuitem); + gtk_widget_show(menuitem); setmenu = gtk_menu_new(); gtk_widget_show(setmenu); @@ -2702,31 +2735,33 @@ gtk_widget_show(menuitem); menuitem = gtk_menu_item_new_with_label(_("Directory Info")); gtk_menu_append(GTK_MENU(setmenu), menuitem); - gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(show_set_dir), NULL); + gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(show_set_dir), NULL); gtk_widget_show(menuitem); menuitem = gtk_menu_item_new_with_label(_("Change Password")); gtk_menu_append(GTK_MENU(setmenu), menuitem); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(show_change_passwd), NULL); gtk_widget_show(menuitem); #else - gaim_new_item_with_pixmap(menu, _("Accounts"), add_small_xpm, - GTK_SIGNAL_FUNC(account_editor), 'a', GDK_CONTROL_MASK, "Ctl+A"); + gaim_new_item_with_pixmap(menu, _("Accounts"), add_small_xpm, + GTK_SIGNAL_FUNC(account_editor), 'a', GDK_CONTROL_MASK, "Ctl+A"); protomenu = gtk_menu_new(); - menuitem = gaim_new_item_with_pixmap(menu, _("Protocol Actions"), prefs_small_xpm, NULL, 0, 0, 0); + menuitem = + gaim_new_item_with_pixmap(menu, _("Protocol Actions"), prefs_small_xpm, NULL, 0, 0, 0); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), protomenu); do_proto_menu(); #endif - gaim_new_item_with_pixmap(menu, _("Preferences"), prefs_small_xpm, - GTK_SIGNAL_FUNC(show_prefs), 'p', GDK_CONTROL_MASK, "Ctl+P"); - gaim_new_item_with_pixmap(menu, _("View System Log"), prefs_small_xpm, - GTK_SIGNAL_FUNC(show_syslog), 0, 0, 0); + gaim_new_item_with_pixmap(menu, _("Preferences"), prefs_small_xpm, + GTK_SIGNAL_FUNC(show_prefs), 'p', GDK_CONTROL_MASK, "Ctl+P"); + gaim_new_item_with_pixmap(menu, _("View System Log"), prefs_small_xpm, + GTK_SIGNAL_FUNC(show_syslog), 0, 0, 0); gaim_separator(menu); #ifdef GAIM_PLUGINS - gaim_new_item_with_pixmap(menu, _("Plugins"), plugins_small_xpm, GTK_SIGNAL_FUNC(show_plugins), 0, 0, 0); + gaim_new_item_with_pixmap(menu, _("Plugins"), plugins_small_xpm, GTK_SIGNAL_FUNC(show_plugins), + 0, 0, 0); #endif #ifdef USE_PERL perlmenu = gtk_menu_new(); @@ -2754,162 +2789,165 @@ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); gtk_menu_item_right_justify(GTK_MENU_ITEM(menuitem)); gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem); - + gaim_new_item_with_pixmap(menu, _("About Gaim"), about_small_xpm, show_about, GDK_F1, 0, NULL); - gtk_widget_show(menubar); - - vbox = gtk_vbox_new(FALSE, 0); - - notebook = gtk_notebook_new(); - - - - - /* Do buddy list stuff */ - /* FIXME: spacing on both panes is ad hoc */ - buddypane = gtk_vbox_new(FALSE, 1); - - buddies = gtk_tree_new(); - sw = gtk_scrolled_window_new(NULL, NULL); - + gtk_widget_show(menubar); + + vbox = gtk_vbox_new(FALSE, 0); + + notebook = gtk_notebook_new(); + + + + + /* Do buddy list stuff */ + /* FIXME: spacing on both panes is ad hoc */ + buddypane = gtk_vbox_new(FALSE, 1); + + buddies = gtk_tree_new(); + sw = gtk_scrolled_window_new(NULL, NULL); + tips = gtk_tooltips_new(); gtk_object_set_data(GTK_OBJECT(blist), _("Buddy List"), tips); - + /* Now the buddy list */ - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw),buddies); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), buddies); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), - GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); - gtk_widget_set_usize(sw,200,200); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_widget_set_usize(sw, 200, 200); gtk_widget_show(buddies); gtk_widget_show(sw); - gtk_box_pack_start(GTK_BOX(buddypane), sw, TRUE, TRUE, 0); - gtk_widget_show(buddypane); + gtk_box_pack_start(GTK_BOX(buddypane), sw, TRUE, TRUE, 0); + gtk_widget_show(buddypane); if (!(blist_options & OPT_BLIST_NO_BUTTONS)) build_imchat_box(TRUE); - /* Swing the edit buddy */ - editpane = gtk_vbox_new(FALSE, 1); - - addbutton = gtk_button_new_with_label(_("Add")); - groupbutton = gtk_button_new_with_label(_("Group")); - rembutton = gtk_button_new_with_label(_("Remove")); - + /* Swing the edit buddy */ + editpane = gtk_vbox_new(FALSE, 1); + + addbutton = gtk_button_new_with_label(_("Add")); + groupbutton = gtk_button_new_with_label(_("Group")); + rembutton = gtk_button_new_with_label(_("Remove")); + if (misc_options & OPT_MISC_COOL_LOOK) { gtk_button_set_relief(GTK_BUTTON(addbutton), GTK_RELIEF_NONE); gtk_button_set_relief(GTK_BUTTON(groupbutton), GTK_RELIEF_NONE); gtk_button_set_relief(GTK_BUTTON(rembutton), GTK_RELIEF_NONE); } - + edittree = gtk_ctree_new(1, 0); - gtk_ctree_set_line_style (GTK_CTREE(edittree), GTK_CTREE_LINES_SOLID); - gtk_ctree_set_expander_style(GTK_CTREE(edittree), GTK_CTREE_EXPANDER_SQUARE); + gtk_ctree_set_line_style(GTK_CTREE(edittree), GTK_CTREE_LINES_SOLID); + gtk_ctree_set_expander_style(GTK_CTREE(edittree), GTK_CTREE_EXPANDER_SQUARE); gtk_clist_set_reorderable(GTK_CLIST(edittree), TRUE); gtk_signal_connect(GTK_OBJECT(edittree), "button_press_event", GTK_SIGNAL_FUNC(click_edit_tree), NULL); - gtk_ctree_set_drag_compare_func (GTK_CTREE(edittree), - (GtkCTreeCompareDragFunc)edit_drag_compare_func); - - - gtk_signal_connect_after (GTK_OBJECT (edittree), "tree_move", - GTK_SIGNAL_FUNC (edit_tree_move), NULL); - - + gtk_ctree_set_drag_compare_func(GTK_CTREE(edittree), + (GtkCTreeCompareDragFunc) edit_drag_compare_func); + + + gtk_signal_connect_after(GTK_OBJECT(edittree), "tree_move", + GTK_SIGNAL_FUNC(edit_tree_move), NULL); + + bbox = gtk_hbox_new(TRUE, 5); - gtk_container_set_border_width(GTK_CONTAINER(bbox), 5); - tbox = gtk_scrolled_window_new(NULL, NULL); - /* Put the buttons in the box */ - gtk_box_pack_start(GTK_BOX(bbox), addbutton, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(bbox), groupbutton, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(bbox), rembutton, TRUE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(bbox), 5); + tbox = gtk_scrolled_window_new(NULL, NULL); + /* Put the buttons in the box */ + gtk_box_pack_start(GTK_BOX(bbox), addbutton, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(bbox), groupbutton, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(bbox), rembutton, TRUE, TRUE, 0); gtk_tooltips_set_tip(tips, addbutton, _("Add a new Buddy"), "Penguin"); gtk_tooltips_set_tip(tips, groupbutton, _("Add a new Group"), "Penguin"); gtk_tooltips_set_tip(tips, rembutton, _("Remove selected Buddy/Group"), "Penguin"); - /* And the boxes in the box */ - gtk_box_pack_start(GTK_BOX(editpane), tbox, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(editpane), bbox, FALSE, FALSE, 0); + /* And the boxes in the box */ + gtk_box_pack_start(GTK_BOX(editpane), tbox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(editpane), bbox, FALSE, FALSE, 0); /* Handle closes right */ - - - /* Finish up */ - gtk_widget_show(addbutton); - gtk_widget_show(groupbutton); - gtk_widget_show(rembutton); - gtk_widget_show(edittree); - gtk_widget_show(tbox); - gtk_widget_show(bbox); + + + /* Finish up */ + gtk_widget_show(addbutton); + gtk_widget_show(groupbutton); + gtk_widget_show(rembutton); + gtk_widget_show(edittree); + gtk_widget_show(tbox); + gtk_widget_show(bbox); gtk_widget_show(editpane); - + update_button_pix(); - label = gtk_label_new(_("Online")); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), buddypane, label); - label = gtk_label_new(_("Edit Buddies")); + label = gtk_label_new(_("Online")); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), buddypane, label); + label = gtk_label_new(_("Edit Buddies")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), editpane, label); - gtk_widget_show_all(notebook); + gtk_widget_show_all(notebook); /* Pack things in the vbox */ - gtk_widget_show(vbox); - - - gtk_widget_show(notebook); - - /* Enable buttons */ - - gtk_signal_connect(GTK_OBJECT(rembutton), "clicked", GTK_SIGNAL_FUNC(do_del_buddy), edittree); - gtk_signal_connect(GTK_OBJECT(addbutton), "clicked", GTK_SIGNAL_FUNC(add_buddy_callback), NULL); - gtk_signal_connect(GTK_OBJECT(groupbutton), "clicked", GTK_SIGNAL_FUNC(add_group_callback), NULL); - gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); + gtk_widget_show(vbox); + + + gtk_widget_show(notebook); + + /* Enable buttons */ + + gtk_signal_connect(GTK_OBJECT(rembutton), "clicked", GTK_SIGNAL_FUNC(do_del_buddy), edittree); + gtk_signal_connect(GTK_OBJECT(addbutton), "clicked", GTK_SIGNAL_FUNC(add_buddy_callback), NULL); + gtk_signal_connect(GTK_OBJECT(groupbutton), "clicked", GTK_SIGNAL_FUNC(add_group_callback), + NULL); + gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(blist), vbox); + gtk_container_add(GTK_CONTAINER(blist), vbox); #ifndef USE_APPLET - gtk_signal_connect(GTK_OBJECT(blist), "delete_event", GTK_SIGNAL_FUNC(do_quit), blist); + gtk_signal_connect(GTK_OBJECT(blist), "delete_event", GTK_SIGNAL_FUNC(do_quit), blist); #else - gtk_signal_connect(GTK_OBJECT(blist), "delete_event", GTK_SIGNAL_FUNC(applet_destroy_buddy), NULL); + gtk_signal_connect(GTK_OBJECT(blist), "delete_event", GTK_SIGNAL_FUNC(applet_destroy_buddy), + NULL); #endif - gtk_signal_connect(GTK_OBJECT(blist), "configure_event", GTK_SIGNAL_FUNC(move_blist_window), NULL); - - - - /* The edit tree */ - gtk_container_add(GTK_CONTAINER(tbox), edittree); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tbox), - GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC); - - - gtk_window_set_title(GTK_WINDOW(blist), _("Gaim - Buddy List")); - - if (blist_options & OPT_BLIST_SAVED_WINDOWS) { - if (blist_pos.width != 0) { /* Sanity check! */ - gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff, + gtk_signal_connect(GTK_OBJECT(blist), "configure_event", GTK_SIGNAL_FUNC(move_blist_window), + NULL); + + + + /* The edit tree */ + gtk_container_add(GTK_CONTAINER(tbox), edittree); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tbox), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + + + gtk_window_set_title(GTK_WINDOW(blist), _("Gaim - Buddy List")); + + if (blist_options & OPT_BLIST_SAVED_WINDOWS) { + if (blist_pos.width != 0) { /* Sanity check! */ + gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff, blist_pos.y - blist_pos.yoff); - gtk_widget_set_usize(blist, blist_pos.width, blist_pos.height); - } - } + gtk_widget_set_usize(blist, blist_pos.width, blist_pos.height); + } + } } void refresh_buddy_window() { - build_edit_tree(); - - update_button_pix(); - gtk_widget_show(blist); + build_edit_tree(); + + update_button_pix(); + gtk_widget_show(blist); } void parse_toc_buddy_list(struct gaim_connection *gc, char *config, int from_do_import) @@ -2925,9 +2963,9 @@ if (config != NULL) { /* skip "CONFIG:" (if it exists) */ - c = strncmp(config + 6 /* sizeof(struct sflap_hdr) */, "CONFIG:", strlen("CONFIG:")) ? + c = strncmp(config + 6 /* sizeof(struct sflap_hdr) */ , "CONFIG:", strlen("CONFIG:")) ? strtok(config, "\n") : - strtok(config + 6 /* sizeof(struct sflap_hdr) */ + strlen("CONFIG:"), "\n"); + strtok(config + 6 /* sizeof(struct sflap_hdr) */ + strlen("CONFIG:"), "\n"); do { if (c == NULL) break; @@ -2957,10 +2995,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); @@ -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);
--- a/src/buddy_chat.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/buddy_chat.c Thu Sep 27 19:17:11 2001 +0000 @@ -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;
--- a/src/conversation.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/conversation.c Thu Sep 27 19:17:11 2001 +0000 @@ -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);
--- a/src/dialogs.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/dialogs.c Thu Sep 27 19:17:11 2001 +0000 @@ -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; -static GtkWidget *imdialog = NULL; /*I only want ONE of these :) */ +static GtkWidget *imdialog = NULL; /*I only want ONE of these :) */ static GtkWidget *infodialog = NULL; static GList *dialogwindows = NULL; static GtkWidget *exportdialog, *importdialog; @@ -93,39 +93,39 @@ static GtkWidget *rename_bud_dialog = NULL; struct create_away { - GtkWidget *window; - GtkWidget *entry; - GtkWidget *text; + GtkWidget *window; + GtkWidget *entry; + GtkWidget *text; struct away_message *mess; }; struct warning { - GtkWidget *window; - GtkWidget *anon; - char *who; + GtkWidget *window; + GtkWidget *anon; + char *who; struct gaim_connection *gc; }; struct addbuddy { - GtkWidget *window; - GtkWidget *combo; - GtkWidget *entry; - GtkWidget *entry_for_alias; + GtkWidget *window; + GtkWidget *combo; + GtkWidget *entry; + GtkWidget *entry_for_alias; struct gaim_connection *gc; }; struct addperm { - GtkWidget *window; - GtkWidget *entry; + GtkWidget *window; + GtkWidget *entry; struct gaim_connection *gc; gboolean permit; }; struct addbp { - GtkWidget *window; - GtkWidget *nameentry; - GtkWidget *messentry; + GtkWidget *window; + GtkWidget *nameentry; + GtkWidget *messentry; GtkWidget *commentry; GtkWidget *command; GtkWidget *sendim; @@ -226,8 +226,7 @@ gchar *object_data; object_data = gtk_object_get_user_data(GTK_OBJECT(w)); - if (GTK_IS_COLOR_SELECTION_DIALOG(w)) - { + if (GTK_IS_COLOR_SELECTION_DIALOG(w)) { set_state_lock(1); if (w == c->fg_color_dialog) { gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->fgcolorbtn), FALSE); @@ -237,45 +236,39 @@ c->bg_color_dialog = NULL; } set_state_lock(0); - } - else if (GTK_IS_FONT_SELECTION_DIALOG(w)) - { + } else if (GTK_IS_FONT_SELECTION_DIALOG(w)) { set_state_lock(1); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->font), FALSE); set_state_lock(0); c->font_dialog = NULL; - } - else if (!g_strcasecmp(object_data, "smiley dialog")) - { + } else if (!g_strcasecmp(object_data, "smiley dialog")) { set_state_lock(1); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->smiley), FALSE); set_state_lock(0); c->smiley_dialog = NULL; - } - else if (!g_strcasecmp(object_data, "log dialog")) - { + } else if (!g_strcasecmp(object_data, "log dialog")) { set_state_lock(1); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->wood), FALSE); set_state_lock(0); c->log_dialog = NULL; } - + dialogwindows = g_list_remove(dialogwindows, w); gtk_widget_destroy(w); - + return FALSE; } static void destroy_dialog(GtkWidget *w, GtkWidget *w2) { - GtkWidget *dest; - - if (!GTK_IS_WIDGET(w2)) - dest = w; - else - dest = w2; - - if (dest == imdialog) + GtkWidget *dest; + + if (!GTK_IS_WIDGET(w2)) + dest = w; + else + dest = w2; + + if (dest == imdialog) imdialog = NULL; if (dest == infodialog) @@ -298,63 +291,62 @@ if (dest == rename_dialog) rename_dialog = NULL; - + if (dest == rename_bud_dialog) rename_bud_dialog = NULL; - dialogwindows = g_list_remove(dialogwindows, dest); - gtk_widget_destroy(dest); + dialogwindows = g_list_remove(dialogwindows, dest); + gtk_widget_destroy(dest); } void destroy_all_dialogs() { - GList *d = dialogwindows; - - while(d) { - destroy_dialog(NULL, d->data); - d = d->next; - } - - g_list_free(dialogwindows); - dialogwindows = NULL; + GList *d = dialogwindows; + + while (d) { + destroy_dialog(NULL, d->data); + d = d->next; + } + + g_list_free(dialogwindows); + dialogwindows = NULL; if (awaymessage) do_im_back(NULL, NULL); - if (imdialog) { - destroy_dialog(NULL, imdialog); - imdialog = NULL; - } + if (imdialog) { + destroy_dialog(NULL, imdialog); + imdialog = NULL; + } if (infodialog) { - destroy_dialog(NULL, infodialog); - infodialog = NULL; - } - - if (exportdialog) { - destroy_dialog(NULL, exportdialog); - exportdialog = NULL; - } - - if (importdialog) { - destroy_dialog(NULL, importdialog); - importdialog = NULL; - } - - if (icondlg) { - destroy_dialog(NULL, icondlg); - icondlg = NULL; - } + destroy_dialog(NULL, infodialog); + infodialog = NULL; + } + + if (exportdialog) { + destroy_dialog(NULL, exportdialog); + exportdialog = NULL; + } + + if (importdialog) { + destroy_dialog(NULL, importdialog); + importdialog = NULL; + } + + if (icondlg) { + destroy_dialog(NULL, icondlg); + icondlg = NULL; + } } static void do_warn(GtkWidget *widget, struct warning *w) { - serv_warn(w->gc, w->who, (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->anon))) ? - 1 : 0); - - destroy_dialog(NULL, w->window); + serv_warn(w->gc, w->who, (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w->anon))) ? 1 : 0); + + destroy_dialog(NULL, w->window); } static void free_warn_data(GtkObject *obj, struct warning *w) @@ -368,68 +360,65 @@ GtkWidget *warn; GtkWidget *label; GtkWidget *vbox; - GtkWidget *bbox; + GtkWidget *bbox; GtkWidget *frame; GtkWidget *fbox; char buf[128]; - struct warning *w = g_new0(struct warning, 1); - w->who = who; + struct warning *w = g_new0(struct warning, 1); + w->who = who; w->gc = gc; - - w->window = gtk_window_new(GTK_WINDOW_DIALOG); + + w->window = gtk_window_new(GTK_WINDOW_DIALOG); dialogwindows = g_list_prepend(dialogwindows, w->window); - gtk_window_set_wmclass(GTK_WINDOW(w->window), "warning", "Gaim"); + gtk_window_set_wmclass(GTK_WINDOW(w->window), "warning", "Gaim"); gtk_window_set_policy(GTK_WINDOW(w->window), FALSE, FALSE, TRUE); gtk_window_set_title(GTK_WINDOW(w->window), _("Gaim - Warn user?")); gtk_container_set_border_width(GTK_CONTAINER(w->window), 5); - gtk_signal_connect(GTK_OBJECT(w->window), "delete_event", - GTK_SIGNAL_FUNC(destroy_dialog), w->window); - gtk_signal_connect(GTK_OBJECT(w->window), "delete_event", - GTK_SIGNAL_FUNC(free_warn_data), w); + gtk_signal_connect(GTK_OBJECT(w->window), "delete_event", + GTK_SIGNAL_FUNC(destroy_dialog), w->window); + gtk_signal_connect(GTK_OBJECT(w->window), "delete_event", GTK_SIGNAL_FUNC(free_warn_data), w); gtk_widget_realize(w->window); - aol_icon(w->window->window); + aol_icon(w->window->window); fbox = gtk_vbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(w->window), fbox); + gtk_container_add(GTK_CONTAINER(w->window), fbox); gtk_widget_show(fbox); frame = gtk_frame_new(_("Warn")); gtk_box_pack_start(GTK_BOX(fbox), frame, FALSE, FALSE, 5); gtk_widget_show(frame); - vbox = gtk_vbox_new(FALSE, 5); + vbox = gtk_vbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_widget_show(vbox); - - g_snprintf(buf, 127, _("Do you really want to warn %s?"), who); - label = gtk_label_new(buf); - gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 5); - gtk_widget_show(label); - - w->anon = gtk_check_button_new_with_label(_("Warn anonymously?")); - gtk_box_pack_start(GTK_BOX(vbox), w->anon, TRUE, TRUE, 5); - gtk_widget_show(w->anon); - - label = gtk_label_new(_("Anonymous warnings are less harsh.")); - gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 5); - gtk_widget_show(label); - - bbox = gtk_hbox_new(TRUE, 10); - gtk_box_pack_start(GTK_BOX(fbox), bbox, FALSE, FALSE, 5); - gtk_widget_show(bbox); + gtk_widget_show(vbox); + + g_snprintf(buf, 127, _("Do you really want to warn %s?"), who); + label = gtk_label_new(buf); + gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 5); + gtk_widget_show(label); + + w->anon = gtk_check_button_new_with_label(_("Warn anonymously?")); + gtk_box_pack_start(GTK_BOX(vbox), w->anon, TRUE, TRUE, 5); + gtk_widget_show(w->anon); + + label = gtk_label_new(_("Anonymous warnings are less harsh.")); + gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 5); + gtk_widget_show(label); + + bbox = gtk_hbox_new(TRUE, 10); + gtk_box_pack_start(GTK_BOX(fbox), bbox, FALSE, FALSE, 5); + gtk_widget_show(bbox); warn = picture_button(w->window, _("Warn"), warn_xpm); gtk_box_pack_start(GTK_BOX(bbox), warn, FALSE, FALSE, 5); - gtk_signal_connect(GTK_OBJECT(warn), "clicked", - GTK_SIGNAL_FUNC(do_warn), w); + gtk_signal_connect(GTK_OBJECT(warn), "clicked", GTK_SIGNAL_FUNC(do_warn), w); cancel = picture_button(w->window, _("Cancel"), cancel_xpm); - gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5); - gtk_signal_connect(GTK_OBJECT(cancel), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), w->window); - - gtk_widget_show(w->window); + gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5); + gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), w->window); + + gtk_widget_show(w->window); } @@ -437,27 +426,24 @@ /* The dialog for getting an error */ /*------------------------------------------------------------------------*/ -GtkWidget* -do_error_dialog(char *message, char *title) +GtkWidget *do_error_dialog(char *message, char *title) { - GtkWidget *d; + GtkWidget *d; GtkWidget *label; GtkWidget *close; d = gtk_dialog_new(); gtk_window_set_policy(GTK_WINDOW(d), FALSE, FALSE, TRUE); - gtk_widget_realize(d); - label = gtk_label_new(message); - gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + gtk_widget_realize(d); + label = gtk_label_new(message); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox), - label, FALSE, FALSE, 5); - + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox), label, FALSE, FALSE, 5); + close = picture_button(d, _("Close"), cancel_xpm); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->action_area), - close, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->action_area), close, FALSE, FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(d), 5); gtk_window_set_title(GTK_WINDOW(d), title); @@ -475,11 +461,11 @@ { char *who; struct conversation *c; - + who = g_strdup(gtk_entry_get_text(GTK_ENTRY(imentry))); destroy_dialog(NULL, imdialog); imdialog = NULL; - + if (!g_strcasecmp(who, "")) { g_free(who); return; @@ -498,16 +484,16 @@ static void do_info(GtkWidget *widget, GtkWidget *infoentry) { char *who; - + who = g_strdup(normalize(gtk_entry_get_text(GTK_ENTRY(infoentry)))); destroy_dialog(NULL, infodialog); infodialog = NULL; - + if (!g_strcasecmp(who, "")) { g_free(who); return; } - + /* what do we want to do about this case? */ if (connections) serv_get_info(connections->data, who); @@ -547,8 +533,7 @@ gtk_container_add(GTK_CONTAINER(eedialog), box); gtk_window_set_title(GTK_WINDOW(eedialog), "Gaim - SUPRISE!"); - gtk_signal_connect(GTK_OBJECT(ok), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), eedialog); + gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), eedialog); gtk_widget_realize(eedialog); aol_icon(eedialog->window); @@ -557,18 +542,17 @@ void show_im_dialog() { - GtkWidget *mainbox; + GtkWidget *mainbox; GtkWidget *frame; GtkWidget *fbox; - GtkWidget *bbox; + GtkWidget *bbox; GtkWidget *button; GtkWidget *imentry; - GtkWidget *label; - - if (!imdialog) { + GtkWidget *label; + + if (!imdialog) { imdialog = gtk_window_new(GTK_WINDOW_DIALOG); - gtk_window_set_wmclass(GTK_WINDOW(imdialog), "imdialog", - "Gaim"); + gtk_window_set_wmclass(GTK_WINDOW(imdialog), "imdialog", "Gaim"); gtk_window_set_policy(GTK_WINDOW(imdialog), FALSE, TRUE, TRUE); gtk_window_set_title(GTK_WINDOW(imdialog), _("Gaim - IM user")); gtk_signal_connect(GTK_OBJECT(imdialog), "destroy", @@ -592,8 +576,7 @@ imentry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(fbox), imentry, TRUE, TRUE, 0); - gtk_signal_connect(GTK_OBJECT(imentry), "activate", - GTK_SIGNAL_FUNC(do_im), imentry); + gtk_signal_connect(GTK_OBJECT(imentry), "activate", GTK_SIGNAL_FUNC(do_im), imentry); gtk_widget_grab_focus(imentry); bbox = gtk_hbox_new(FALSE, 5); @@ -606,59 +589,57 @@ button = picture_button(imdialog, _("OK"), ok_xpm); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(do_im), imentry); - } - - gtk_widget_show_all(imdialog); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_im), imentry); + } + + gtk_widget_show_all(imdialog); } void show_info_dialog() { - GtkWidget *mainbox; + GtkWidget *mainbox; GtkWidget *frame; GtkWidget *fbox; - GtkWidget *bbox; + GtkWidget *bbox; GtkWidget *button; GtkWidget *infoentry; - GtkWidget *label; - - if (!infodialog) { - - infodialog = gtk_window_new(GTK_WINDOW_DIALOG); - gtk_window_set_wmclass(GTK_WINDOW(infodialog), "infodialog", - "Gaim"); + GtkWidget *label; + + if (!infodialog) { + + infodialog = gtk_window_new(GTK_WINDOW_DIALOG); + gtk_window_set_wmclass(GTK_WINDOW(infodialog), "infodialog", "Gaim"); gtk_window_set_policy(GTK_WINDOW(infodialog), FALSE, TRUE, TRUE); - gtk_widget_realize(infodialog); - - mainbox = gtk_vbox_new(FALSE, 5); + gtk_widget_realize(infodialog); + + mainbox = gtk_vbox_new(FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5); gtk_container_add(GTK_CONTAINER(infodialog), mainbox); frame = gtk_frame_new(_("Get User Info")); - gtk_box_pack_start(GTK_BOX(mainbox), frame, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(mainbox), frame, TRUE, TRUE, 0); fbox = gtk_hbox_new(FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(fbox), 5); gtk_container_add(GTK_CONTAINER(frame), fbox); - label = gtk_label_new(_("User:")); - gtk_box_pack_start(GTK_BOX(fbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); + label = gtk_label_new(_("User:")); + gtk_box_pack_start(GTK_BOX(fbox), label, FALSE, FALSE, 0); + gtk_widget_show(label); infoentry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(fbox), infoentry, TRUE, TRUE, 0); - - /* Handle closes right */ + gtk_box_pack_start(GTK_BOX(fbox), infoentry, TRUE, TRUE, 0); + + /* Handle closes right */ gtk_signal_connect(GTK_OBJECT(infoentry), "activate", GTK_SIGNAL_FUNC(do_info), infoentry); - gtk_signal_connect(GTK_OBJECT(infodialog), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), infodialog); - - /* Buttons */ + gtk_signal_connect(GTK_OBJECT(infodialog), "destroy", + GTK_SIGNAL_FUNC(destroy_dialog), infodialog); + + /* Buttons */ bbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0); - + gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0); + button = picture_button(infodialog, _("Cancel"), cancel_xpm); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(button), "clicked", @@ -666,15 +647,14 @@ button = picture_button(infodialog, _("OK"), ok_xpm); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(do_info), infoentry); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_info), infoentry); /* Finish up */ gtk_window_set_title(GTK_WINDOW(infodialog), _("Gaim - Get User Info")); - gtk_widget_grab_focus(infoentry); - + gtk_widget_grab_focus(infoentry); + aol_icon(infodialog->window); - } + } gtk_widget_show_all(infodialog); } @@ -688,13 +668,13 @@ void do_add_buddy(GtkWidget *w, struct addbuddy *a) { char *grp, *who, *whoalias; - struct conversation *c; - + struct conversation *c; + who = gtk_entry_get_text(GTK_ENTRY(a->entry)); - grp = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(a->combo)->entry)); - whoalias = gtk_entry_get_text(GTK_ENTRY(a->entry_for_alias)); - - c = find_conversation(who); + grp = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(a->combo)->entry)); + whoalias = gtk_entry_get_text(GTK_ENTRY(a->entry_for_alias)); + + c = find_conversation(who); if (a->gc) { add_buddy(a->gc, grp, who, whoalias); @@ -705,13 +685,13 @@ a->gc = connections->data; } - if (c != NULL) { + if (c != NULL) { update_buttons_by_protocol(c); } - + do_export(a->gc); - destroy_dialog(NULL, a->window); + destroy_dialog(NULL, a->window); } void do_add_group(GtkWidget *w, struct addbuddy *a) @@ -720,7 +700,8 @@ grp = gtk_entry_get_text(GTK_ENTRY(a->entry)); - if (a->gc) add_group(a->gc, grp); + if (a->gc) + add_group(a->gc, grp); else if (connections) { add_group(connections->data, grp); a->gc = connections->data; @@ -734,19 +715,19 @@ static GList *groups_tree(struct gaim_connection *gc) { - GList *tmp=NULL; - char *tmp2; + GList *tmp = NULL; + char *tmp2; struct group *g; - GSList *grp = gc->groups; - + GSList *grp = gc->groups; + if (!grp) { - tmp2 = g_strdup(_("Buddies")); - tmp = g_list_append(tmp, tmp2); + tmp2 = g_strdup(_("Buddies")); + tmp = g_list_append(tmp, tmp2); } else { - while(grp) { + while (grp) { g = (struct group *)grp->data; - tmp2 = g->name; - tmp=g_list_append(tmp, tmp2); + tmp2 = g->name; + tmp = g_list_append(tmp, tmp2); grp = g_slist_next(grp); } } @@ -766,154 +747,143 @@ GtkWidget *label; GtkWidget *bbox; GtkWidget *vbox; - GtkWidget *topbox; + GtkWidget *topbox; GtkWidget *frame; - struct addbuddy *a = g_new0(struct addbuddy, 1); + struct addbuddy *a = g_new0(struct addbuddy, 1); a->gc = gc; - - a->window = gtk_window_new(GTK_WINDOW_DIALOG); + + a->window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_group", "Gaim"); gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE); gtk_widget_realize(a->window); dialogwindows = g_list_prepend(dialogwindows, a->window); bbox = gtk_hbox_new(TRUE, 10); - topbox = gtk_hbox_new(FALSE, 5); - vbox = gtk_vbox_new(FALSE, 5); - - a->entry = gtk_entry_new(); - /* Put the buttons in the box */ + topbox = gtk_hbox_new(FALSE, 5); + vbox = gtk_vbox_new(FALSE, 5); + + a->entry = gtk_entry_new(); + /* Put the buttons in the box */ add = picture_button(a->window, _("Add"), add_xpm); cancel = picture_button(a->window, _("Cancel"), cancel_xpm); - gtk_box_pack_start(GTK_BOX(bbox), add, FALSE, FALSE, 5); - gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(bbox), add, FALSE, FALSE, 5); + gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5); frame = gtk_frame_new(NULL); gtk_frame_set_label(GTK_FRAME(frame), _("Add Group")); - label = gtk_label_new(_("Group")); - gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); - gtk_box_pack_start(GTK_BOX(topbox), a->entry, FALSE, FALSE, 5); - - /* And the boxes in the box */ - gtk_box_pack_start(GTK_BOX(vbox), topbox, TRUE, TRUE, 5); - gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 5); - - /* Handle closes right */ - gtk_signal_connect(GTK_OBJECT(a->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), a->window); - gtk_signal_connect(GTK_OBJECT(a->window), "destroy", - GTK_SIGNAL_FUNC(free_dialog), a); - gtk_signal_connect(GTK_OBJECT(cancel), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), a->window); - gtk_signal_connect(GTK_OBJECT(add), "clicked", - GTK_SIGNAL_FUNC(do_add_group), a); - gtk_signal_connect(GTK_OBJECT(a->entry), "activate", - GTK_SIGNAL_FUNC(do_add_group), a); - /* Finish up */ - gtk_widget_show(add); - gtk_widget_show(cancel); - gtk_widget_show(a->entry); - gtk_widget_show(topbox); - gtk_widget_show(bbox); - gtk_widget_show(vbox); + label = gtk_label_new(_("Group")); + gtk_widget_show(label); + gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(topbox), a->entry, FALSE, FALSE, 5); + + /* And the boxes in the box */ + gtk_box_pack_start(GTK_BOX(vbox), topbox, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 5); + + /* Handle closes right */ + gtk_signal_connect(GTK_OBJECT(a->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), a->window); + gtk_signal_connect(GTK_OBJECT(a->window), "destroy", GTK_SIGNAL_FUNC(free_dialog), a); + gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), a->window); + gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(do_add_group), a); + gtk_signal_connect(GTK_OBJECT(a->entry), "activate", GTK_SIGNAL_FUNC(do_add_group), a); + /* Finish up */ + gtk_widget_show(add); + gtk_widget_show(cancel); + gtk_widget_show(a->entry); + gtk_widget_show(topbox); + gtk_widget_show(bbox); + gtk_widget_show(vbox); gtk_widget_show(frame); - gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Group")); - gtk_window_set_focus(GTK_WINDOW(a->window), a->entry); + gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Group")); + gtk_window_set_focus(GTK_WINDOW(a->window), a->entry); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_add(GTK_CONTAINER(a->window), frame); + gtk_container_add(GTK_CONTAINER(a->window), frame); gtk_container_set_border_width(GTK_CONTAINER(a->window), 5); - gtk_widget_realize(a->window); - aol_icon(a->window->window); + gtk_widget_realize(a->window); + aol_icon(a->window->window); gtk_widget_show(a->window); } void show_add_buddy(struct gaim_connection *gc, char *buddy, char *group) { - GtkWidget *mainbox; + GtkWidget *mainbox; GtkWidget *frame; - GtkWidget *table; + GtkWidget *table; GtkWidget *bbox; GtkWidget *cancel; GtkWidget *add; GtkWidget *label; - struct addbuddy *a = g_new0(struct addbuddy, 1); + struct addbuddy *a = g_new0(struct addbuddy, 1); a->gc = gc; - a->window = gtk_window_new(GTK_WINDOW_DIALOG); + a->window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_wmclass(GTK_WINDOW(a->window), "add_buddy", "Gaim"); gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE); - gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy")); + gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy")); gtk_widget_realize(a->window); - aol_icon(a->window->window); - gtk_signal_connect(GTK_OBJECT(a->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), a->window); - gtk_signal_connect(GTK_OBJECT(a->window), "destroy", - GTK_SIGNAL_FUNC(free_dialog), a); + aol_icon(a->window->window); + gtk_signal_connect(GTK_OBJECT(a->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), a->window); + gtk_signal_connect(GTK_OBJECT(a->window), "destroy", GTK_SIGNAL_FUNC(free_dialog), a); dialogwindows = g_list_prepend(dialogwindows, a->window); - mainbox = gtk_vbox_new(FALSE, 5); + mainbox = gtk_vbox_new(FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5); - gtk_container_add(GTK_CONTAINER(a->window), mainbox); + gtk_container_add(GTK_CONTAINER(a->window), mainbox); frame = gtk_frame_new(_("Add Buddy")); - gtk_box_pack_start(GTK_BOX(mainbox), frame, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(mainbox), frame, TRUE, TRUE, 0); gtk_widget_show(frame); - table = gtk_table_new(3, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 5); - gtk_table_set_col_spacings(GTK_TABLE(table), 5); + table = gtk_table_new(3, 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_add(GTK_CONTAINER(frame), table); - label = gtk_label_new(_("Contact")); - gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); - - a->entry = gtk_entry_new(); - gtk_table_attach_defaults(GTK_TABLE(table), a->entry, 1, 2, 0, 1); - gtk_window_set_focus(GTK_WINDOW(a->window), a->entry); - if (buddy != NULL) - gtk_entry_set_text(GTK_ENTRY(a->entry), buddy); - gtk_signal_connect(GTK_OBJECT(a->entry), "activate", - GTK_SIGNAL_FUNC(do_add_buddy), a); - - label = gtk_label_new(_("Alias")); - gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); - - a->entry_for_alias = gtk_entry_new(); - gtk_table_attach_defaults(GTK_TABLE(table), a->entry_for_alias, 1, 2, 1, 2); - - label = gtk_label_new(_("Group")); - gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3); - - a->combo = gtk_combo_new(); - gtk_combo_set_popdown_strings(GTK_COMBO(a->combo), - groups_tree(gc ? gc : connections->data)); - if (group != NULL) - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(a->combo)->entry), group); - gtk_table_attach_defaults(GTK_TABLE(table), a->combo, 1, 2, 2, 3); + label = gtk_label_new(_("Contact")); + gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); + + a->entry = gtk_entry_new(); + gtk_table_attach_defaults(GTK_TABLE(table), a->entry, 1, 2, 0, 1); + gtk_window_set_focus(GTK_WINDOW(a->window), a->entry); + if (buddy != NULL) + gtk_entry_set_text(GTK_ENTRY(a->entry), buddy); + gtk_signal_connect(GTK_OBJECT(a->entry), "activate", GTK_SIGNAL_FUNC(do_add_buddy), a); + + label = gtk_label_new(_("Alias")); + gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); + + a->entry_for_alias = gtk_entry_new(); + gtk_table_attach_defaults(GTK_TABLE(table), a->entry_for_alias, 1, 2, 1, 2); + + label = gtk_label_new(_("Group")); + gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3); + + a->combo = gtk_combo_new(); + gtk_combo_set_popdown_strings(GTK_COMBO(a->combo), groups_tree(gc ? gc : connections->data)); + if (group != NULL) + gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(a->combo)->entry), group); + gtk_table_attach_defaults(GTK_TABLE(table), a->combo, 1, 2, 2, 3); bbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(mainbox), bbox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(mainbox), bbox, TRUE, TRUE, 0); cancel = picture_button(a->window, _("Cancel"), cancel_xpm); - gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(cancel), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), a->window); + gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0); + gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), a->window); add = picture_button(a->window, _("Add"), add_xpm); - gtk_box_pack_end(GTK_BOX(bbox), add, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(add), "clicked", - GTK_SIGNAL_FUNC(do_add_buddy), a); - + gtk_box_pack_end(GTK_BOX(bbox), add, FALSE, FALSE, 0); + gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(do_add_buddy), a); + gtk_widget_show_all(a->window); } @@ -925,14 +895,14 @@ void do_new_bp(GtkWidget *w, struct addbp *b) { - struct buddy_pounce *bp = g_new0(struct buddy_pounce, 1); - - if (strlen(gtk_entry_get_text(GTK_ENTRY(b->nameentry))) == 0) { - do_error_dialog(_("Please enter a buddy to pounce."), _("Buddy Pounce Error")); - g_free(bp); - return; + struct buddy_pounce *bp = g_new0(struct buddy_pounce, 1); + + if (strlen(gtk_entry_get_text(GTK_ENTRY(b->nameentry))) == 0) { + do_error_dialog(_("Please enter a buddy to pounce."), _("Buddy Pounce Error")); + g_free(bp); + return; } - + g_snprintf(bp->name, 80, "%s", gtk_entry_get_text(GTK_ENTRY(b->nameentry))); g_snprintf(bp->message, 2048, "%s", gtk_entry_get_text(GTK_ENTRY(b->messentry))); g_snprintf(bp->command, 2048, "%s", gtk_entry_get_text(GTK_ENTRY(b->commentry))); @@ -948,33 +918,33 @@ if (GTK_TOGGLE_BUTTON(b->sendim)->active) bp->options |= OPT_POUNCE_SEND_IM; - + if (GTK_TOGGLE_BUTTON(b->command)->active) bp->options |= OPT_POUNCE_COMMAND; - + if (GTK_TOGGLE_BUTTON(b->sound)->active) bp->options |= OPT_POUNCE_SOUND; - + if (GTK_TOGGLE_BUTTON(b->p_signon)->active) bp->options |= OPT_POUNCE_SIGNON; - + if (GTK_TOGGLE_BUTTON(b->p_unaway)->active) bp->options |= OPT_POUNCE_UNAWAY; - + if (GTK_TOGGLE_BUTTON(b->p_unidle)->active) bp->options |= OPT_POUNCE_UNIDLE; if (GTK_TOGGLE_BUTTON(b->save)->active) bp->options |= OPT_POUNCE_SAVE; - buddy_pounces = g_list_append(buddy_pounces, bp); - - do_bp_menu(); - - destroy_dialog(NULL, b->window); + buddy_pounces = g_list_append(buddy_pounces, bp); + + do_bp_menu(); + + destroy_dialog(NULL, b->window); save_prefs(); - g_free(b); + g_free(b); } static void pounce_choose(GtkWidget *opt, struct addbp *b) @@ -1025,7 +995,8 @@ gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu); gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), - g_list_index(aim_users, ((struct gaim_connection *)connections->data)->user)); + g_list_index(aim_users, + ((struct gaim_connection *)connections->data)->user)); b->user = ((struct gaim_connection *)connections->data)->user; b->menu = optmenu; @@ -1040,23 +1011,22 @@ GtkWidget *hbox; GtkWidget *button; GtkWidget *sep; - - struct addbp *b = g_new0(struct addbp, 1); - - b->window = gtk_window_new(GTK_WINDOW_DIALOG); - dialogwindows = g_list_prepend(dialogwindows, b->window); + + struct addbp *b = g_new0(struct addbp, 1); + + b->window = gtk_window_new(GTK_WINDOW_DIALOG); + dialogwindows = g_list_prepend(dialogwindows, b->window); gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE); gtk_window_set_wmclass(GTK_WINDOW(b->window), "new_bp", "Gaim"); - gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - New Buddy Pounce")); - gtk_signal_connect(GTK_OBJECT(b->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - New Buddy Pounce")); + gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); gtk_widget_realize(b->window); - aol_icon(b->window->window); - - vbox = gtk_vbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); - gtk_container_add(GTK_CONTAINER(b->window), vbox); - gtk_widget_show(vbox); + aol_icon(b->window->window); + + vbox = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); + gtk_container_add(GTK_CONTAINER(b->window), vbox); + gtk_widget_show(vbox); pounce_user_menu(b, vbox); @@ -1064,17 +1034,17 @@ gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); gtk_widget_show(hbox); - label = gtk_label_new(_("Buddy:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - - b->nameentry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(hbox), b->nameentry, TRUE, TRUE, 0); - if (name != NULL) - gtk_entry_set_text(GTK_ENTRY(b->nameentry), name); + label = gtk_label_new(_("Buddy:")); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + gtk_widget_show(label); + + b->nameentry = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(hbox), b->nameentry, TRUE, TRUE, 0); + if (name !=NULL) + gtk_entry_set_text(GTK_ENTRY(b->nameentry), name); gtk_window_set_focus(GTK_WINDOW(b->window), b->nameentry); - gtk_widget_show(b->nameentry); - + gtk_widget_show(b->nameentry); + sep = gtk_hseparator_new(); gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0); gtk_widget_show(sep); @@ -1100,7 +1070,7 @@ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->openwindow), FALSE); gtk_box_pack_start(GTK_BOX(vbox), b->openwindow, FALSE, FALSE, 0); gtk_widget_show(b->openwindow); - + b->sendim = gtk_check_button_new_with_label(_("Send IM on pounce")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sendim), TRUE); gtk_box_pack_start(GTK_BOX(vbox), b->sendim, FALSE, FALSE, 0); @@ -1109,20 +1079,20 @@ hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); gtk_widget_show(hbox); - - label = gtk_label_new(_("Message:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - - b->messentry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(hbox), b->messentry, TRUE, TRUE, 0); - gtk_signal_connect(GTK_OBJECT(b->messentry), "activate", - GTK_SIGNAL_FUNC(do_new_bp), b); - gtk_widget_show(b->messentry); - - gtk_signal_connect(GTK_OBJECT(b->sendim), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), b->messentry); - - b->command = gtk_check_button_new_with_label(_("Execute command on pounce")); + + label = gtk_label_new(_("Message:")); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + gtk_widget_show(label); + + b->messentry = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(hbox), b->messentry, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(b->messentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b); + gtk_widget_show(b->messentry); + + gtk_signal_connect(GTK_OBJECT(b->sendim), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), + b->messentry); + + b->command = gtk_check_button_new_with_label(_("Execute command on pounce")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->command), FALSE); gtk_box_pack_start(GTK_BOX(vbox), b->command, FALSE, FALSE, 0); gtk_widget_show(b->command); @@ -1130,20 +1100,20 @@ hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); gtk_widget_show(hbox); - - label = gtk_label_new(_("Command:")); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - - b->commentry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(hbox), b->commentry, TRUE, TRUE, 0); - gtk_signal_connect(GTK_OBJECT(b->commentry), "activate", - GTK_SIGNAL_FUNC(do_new_bp), b); - gtk_widget_show(b->commentry); + + label = gtk_label_new(_("Command:")); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + gtk_widget_show(label); + + b->commentry = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(hbox), b->commentry, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(b->commentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b); + gtk_widget_show(b->commentry); gtk_widget_set_sensitive(b->commentry, FALSE); - gtk_signal_connect(GTK_OBJECT(b->command), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), b->commentry); - + gtk_signal_connect(GTK_OBJECT(b->command), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), + b->commentry); + b->sound = gtk_check_button_new_with_label(_("Play sound on pounce")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sound), FALSE); gtk_box_pack_start(GTK_BOX(vbox), b->sound, FALSE, FALSE, 0); @@ -1155,22 +1125,22 @@ label = gtk_label_new(_("Sound:")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); + gtk_widget_show(label); b->soundentry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(hbox), b->soundentry, TRUE, TRUE, 0); - gtk_signal_connect(GTK_OBJECT(b->soundentry), "activate", - GTK_SIGNAL_FUNC(do_new_bp), b); + gtk_signal_connect(GTK_OBJECT(b->soundentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b); gtk_widget_show(b->soundentry); gtk_widget_set_sensitive(b->soundentry, FALSE); - gtk_signal_connect(GTK_OBJECT(b->sound), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), b->soundentry); + gtk_signal_connect(GTK_OBJECT(b->sound), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), + b->soundentry); sep = gtk_hseparator_new(); gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0); gtk_widget_show(sep); - b->save = gtk_check_button_new_with_label(_("Save this pounce after activation")); + b->save = gtk_check_button_new_with_label(_("Save this pounce after activation")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->save), FALSE); gtk_box_pack_start(GTK_BOX(vbox), b->save, FALSE, FALSE, 0); gtk_widget_show(b->save); @@ -1179,21 +1149,19 @@ gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0); gtk_widget_show(sep); - bbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); - gtk_widget_show(bbox); + bbox = gtk_hbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); + gtk_widget_show(bbox); button = picture_button(b->window, _("Cancel"), cancel_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); button = picture_button(b->window, _("OK"), ok_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(do_new_bp), b); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_new_bp), b); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_widget_show(b->window); + gtk_widget_show(b->window); } @@ -1212,7 +1180,7 @@ if (b->user) { strncpy_withhtml(b->user->user_info, junk, sizeof b->user->user_info); gc = b->user->gc; - + save_prefs(); if (gc) @@ -1225,8 +1193,8 @@ void do_set_dir(GtkWidget *widget, struct set_dir_dlg *b) { - char *first = gtk_entry_get_text(GTK_ENTRY(b->first)); - int web = GTK_TOGGLE_BUTTON(b->web)->active; + char *first = gtk_entry_get_text(GTK_ENTRY(b->first)); + int web = GTK_TOGGLE_BUTTON(b->web)->active; char *middle = gtk_entry_get_text(GTK_ENTRY(b->middle)); char *last = gtk_entry_get_text(GTK_ENTRY(b->last)); char *maiden = gtk_entry_get_text(GTK_ENTRY(b->maiden)); @@ -1236,7 +1204,7 @@ serv_set_dir(b->gc, first, middle, last, maiden, city, state, country, web); - destroy_dialog(NULL, b->window); + destroy_dialog(NULL, b->window); g_free(b); } @@ -1260,9 +1228,8 @@ gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_dir", "Gaim"); gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE); gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set Dir Info")); - gtk_signal_connect(GTK_OBJECT(b->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); - gtk_widget_realize(b->window); + gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_widget_realize(b->window); aol_icon(b->window->window); fbox = gtk_vbox_new(FALSE, 5); @@ -1270,12 +1237,12 @@ gtk_widget_show(fbox); frame = gtk_frame_new(_("Directory Info")); - gtk_container_set_border_width(GTK_CONTAINER(fbox), 5); + gtk_container_set_border_width(GTK_CONTAINER(fbox), 5); gtk_box_pack_start(GTK_BOX(fbox), frame, FALSE, FALSE, 0); gtk_widget_show(frame); vbox = gtk_vbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_widget_show(vbox); @@ -1293,10 +1260,10 @@ b->country = gtk_entry_new(); b->web = gtk_check_button_new_with_label(_("Allow Web Searches To Find Your Info")); - /* Line 1 */ + /* Line 1 */ label = gtk_label_new(_("First Name")); gtk_widget_show(label); - + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->first, FALSE, FALSE, 0); @@ -1305,9 +1272,9 @@ gtk_widget_show(hbox); /* Line 2 */ - label = gtk_label_new(_("Middle Name")); - gtk_widget_show(label); - + label = gtk_label_new(_("Middle Name")); + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->middle, FALSE, FALSE, 0); @@ -1317,9 +1284,9 @@ /* Line 3 */ - label = gtk_label_new(_("Last Name")); - gtk_widget_show(label); - + label = gtk_label_new(_("Last Name")); + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->last, FALSE, FALSE, 0); @@ -1328,9 +1295,9 @@ gtk_widget_show(hbox); /* Line 4 */ - label = gtk_label_new(_("Maiden Name")); - gtk_widget_show(label); - + label = gtk_label_new(_("Maiden Name")); + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->maiden, FALSE, FALSE, 0); @@ -1339,9 +1306,9 @@ gtk_widget_show(hbox); /* Line 5 */ - label = gtk_label_new(_("City")); - gtk_widget_show(label); - + label = gtk_label_new(_("City")); + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->city, FALSE, FALSE, 0); @@ -1352,7 +1319,7 @@ /* Line 6 */ label = gtk_label_new(_("State")); gtk_widget_show(label); - + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->state, FALSE, FALSE, 0); @@ -1361,9 +1328,9 @@ gtk_widget_show(hbox); /* Line 7 */ - label = gtk_label_new(_("Country")); - gtk_widget_show(label); - + label = gtk_label_new(_("Country")); + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->country, FALSE, FALSE, 0); @@ -1378,11 +1345,11 @@ gtk_widget_show(hbox); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show(b->first); - gtk_widget_show(b->middle); - gtk_widget_show(b->last); - gtk_widget_show(b->maiden); - gtk_widget_show(b->city); + gtk_widget_show(b->first); + gtk_widget_show(b->middle); + gtk_widget_show(b->last); + gtk_widget_show(b->maiden); + gtk_widget_show(b->city); gtk_widget_show(b->state); gtk_widget_show(b->country); gtk_widget_show(b->web); @@ -1395,16 +1362,15 @@ b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm); gtk_box_pack_end(GTK_BOX(bot), b->cancel, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); b->save = picture_button(b->window, _("Save"), save_xpm); gtk_box_pack_end(GTK_BOX(bot), b->save, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(b->save), "clicked", GTK_SIGNAL_FUNC(do_set_dir), b); - - gtk_window_set_focus(GTK_WINDOW(b->window), b->first); - - gtk_widget_show(b->window); + gtk_signal_connect(GTK_OBJECT(b->save), "clicked", GTK_SIGNAL_FUNC(do_set_dir), b); + + gtk_window_set_focus(GTK_WINDOW(b->window), b->first); + + gtk_widget_show(b->window); } void do_change_password(GtkWidget *widget, struct passwddlg *b) @@ -1417,7 +1383,7 @@ if (g_strcasecmp(new1, new2)) { do_error_dialog(_("New Passwords Do Not Match"), _("Gaim - Change Password Error")); - return ; + return; } if ((strlen(orig) < 1) || (strlen(new1) < 1) || (strlen(new2) < 1)) { @@ -1426,7 +1392,7 @@ } serv_change_passwd(b->gc, orig, new1); - + destroy_dialog(NULL, b->window); g_free(b); } @@ -1449,8 +1415,7 @@ gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE); gtk_window_set_wmclass(GTK_WINDOW(b->window), "change_passwd", "Gaim"); gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Password Change")); - gtk_signal_connect(GTK_OBJECT(b->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); gtk_widget_realize(b->window); aol_icon(b->window->window); dialogwindows = g_list_prepend(dialogwindows, b->window); @@ -1488,48 +1453,46 @@ gtk_box_pack_end(GTK_BOX(hbox), b->original, FALSE, FALSE, 0); gtk_widget_show(b->original); - /* Next Line */ + /* Next Line */ hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - label = gtk_label_new(_("New Password")); + label = gtk_label_new(_("New Password")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - - b->new1 = gtk_entry_new(); + gtk_widget_show(label); + + b->new1 = gtk_entry_new(); gtk_entry_set_visibility(GTK_ENTRY(b->new1), FALSE); gtk_box_pack_end(GTK_BOX(hbox), b->new1, FALSE, FALSE, 0); - gtk_widget_show(b->new1); + gtk_widget_show(b->new1); /* Next Line */ hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - + label = gtk_label_new(_("New Password (again)")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - gtk_widget_show(label); - - b->new2 = gtk_entry_new(); + gtk_widget_show(label); + + b->new2 = gtk_entry_new(); gtk_entry_set_visibility(GTK_ENTRY(b->new2), FALSE); gtk_box_pack_end(GTK_BOX(hbox), b->new2, FALSE, FALSE, 0); - gtk_widget_show(b->new2); - - /* Now do our row of buttons */ + gtk_widget_show(b->new2); + + /* Now do our row of buttons */ hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(fbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm); gtk_box_pack_end(GTK_BOX(hbox), b->cancel, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); b->ok = picture_button(b->window, _("OK"), ok_xpm); gtk_box_pack_end(GTK_BOX(hbox), b->ok, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", - GTK_SIGNAL_FUNC(do_change_password), b); + gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", GTK_SIGNAL_FUNC(do_change_password), b); gtk_widget_show(b->window); @@ -1557,30 +1520,30 @@ void show_icon_dialog(GtkWidget *w, gpointer data) { struct set_icon_dlg *b = (struct set_icon_dlg *)data; - char *buf = g_malloc(BUF_LEN); - - if (!icondlg) { - icondlg = gtk_file_selection_new(_("Gaim - Load User Icon")); - - gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(icondlg)); - - g_snprintf(buf, BUF_LEN - 1, "%s/", getenv("HOME")); - - gtk_file_selection_set_filename(GTK_FILE_SELECTION(icondlg), buf); - gtk_signal_connect(GTK_OBJECT(icondlg), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), icondlg); - - gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(icondlg)->ok_button), - "clicked", GTK_SIGNAL_FUNC(do_user_icon), b); - gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(icondlg)->cancel_button), - "clicked", GTK_SIGNAL_FUNC(destroy_dialog), icondlg); - - - } + char *buf = g_malloc(BUF_LEN); + + if (!icondlg) { + icondlg = gtk_file_selection_new(_("Gaim - Load User Icon")); + + gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(icondlg)); + + g_snprintf(buf, BUF_LEN - 1, "%s/", getenv("HOME")); + + gtk_file_selection_set_filename(GTK_FILE_SELECTION(icondlg), buf); + gtk_signal_connect(GTK_OBJECT(icondlg), "destroy", + GTK_SIGNAL_FUNC(destroy_dialog), icondlg); + + gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(icondlg)->ok_button), + "clicked", GTK_SIGNAL_FUNC(do_user_icon), b); + gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(icondlg)->cancel_button), + "clicked", GTK_SIGNAL_FUNC(destroy_dialog), icondlg); + + + } g_free(buf); - gtk_widget_show(icondlg); - gdk_window_raise(icondlg->window); + gtk_widget_show(icondlg); + gdk_window_raise(icondlg->window); } void do_save_icon(GtkWidget *w, struct set_icon_dlg *b) @@ -1627,8 +1590,7 @@ gtk_container_set_border_width(GTK_CONTAINER(b->window), 5); gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_icon", "Gaim"); gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Icon")); - gtk_signal_connect(GTK_OBJECT(b->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); gtk_widget_realize(b->window); aol_icon(b->window->window); dialogwindows = g_list_prepend(dialogwindows, b->window); @@ -1650,10 +1612,10 @@ gtk_container_add(GTK_CONTAINER(frame), hbox); /* - sep = gtk_vseparator_new(); - gtk_widget_show(sep); - gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 5); - */ + sep = gtk_vseparator_new(); + gtk_widget_show(sep); + gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 5); + */ /* A boxy */ rbox = gtk_vbox_new(FALSE, 5); @@ -1668,29 +1630,27 @@ hbox2 = gtk_hbox_new(FALSE, 5); gtk_widget_show(hbox2); gtk_box_pack_start(GTK_BOX(rbox), hbox2, FALSE, FALSE, 5); - + b->entry = gtk_entry_new(); if (strlen(gc->user->iconfile)) { gtk_entry_set_text(GTK_ENTRY(b->entry), gc->user->iconfile); } - + gtk_widget_show(b->entry); - gtk_box_pack_start(GTK_BOX(hbox2), b->entry, TRUE, TRUE, 5); - + gtk_box_pack_start(GTK_BOX(hbox2), b->entry, TRUE, TRUE, 5); + button = gtk_button_new_with_label(_("Browse")); gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 5); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(show_icon_dialog), b); - gtk_widget_show(button); - + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(show_icon_dialog), b); + gtk_widget_show(button); + button = gtk_button_new_with_label(_("Clear")); gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 5); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(do_clear_icon), b); - - gtk_widget_show(button); - + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_clear_icon), b); + + gtk_widget_show(button); + /* button buttons */ buttons = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), buttons, FALSE, FALSE, 0); @@ -1698,18 +1658,16 @@ b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm); gtk_box_pack_end(GTK_BOX(buttons), b->cancel, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); b->ok = picture_button(b->window, _("Ok"), ok_xpm); gtk_box_pack_end(GTK_BOX(buttons), b->ok, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", - GTK_SIGNAL_FUNC(do_save_icon), b); + gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", GTK_SIGNAL_FUNC(do_save_icon), b); /* Show it */ gtk_widget_show(b->window); - + } void show_set_info(struct gaim_connection *gc) @@ -1727,16 +1685,15 @@ b->user = tmp; b->window = gtk_window_new(GTK_WINDOW_DIALOG); - gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_info", "Gaim"); - dialogwindows = g_list_prepend(dialogwindows, b->window); + gtk_window_set_wmclass(GTK_WINDOW(b->window), "set_info", "Gaim"); + dialogwindows = g_list_prepend(dialogwindows, b->window); gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Info")); - gtk_signal_connect(GTK_OBJECT(b->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); gtk_widget_realize(b->window); aol_icon(b->window->window); vbox = gtk_vbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); gtk_container_add(GTK_CONTAINER(b->window), vbox); gtk_widget_show(vbox); @@ -1746,13 +1703,13 @@ g_free(buf); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5); gtk_widget_show(label); - + b->text = gtk_text_new(NULL, NULL); gtk_text_set_word_wrap(GTK_TEXT(b->text), TRUE); gtk_text_set_editable(GTK_TEXT(b->text), TRUE); gtk_widget_set_usize(b->text, 300, 200); - buf = g_malloc(strlen(tmp->user_info)+1); - strncpy_nohtml(buf, tmp->user_info, strlen(tmp->user_info)+1); + buf = g_malloc(strlen(tmp->user_info) + 1); + strncpy_nohtml(buf, tmp->user_info, strlen(tmp->user_info) + 1); gtk_text_insert(GTK_TEXT(b->text), NULL, NULL, NULL, buf, -1); g_free(buf); gtk_box_pack_start(GTK_BOX(vbox), b->text, TRUE, TRUE, 0); @@ -1765,13 +1722,11 @@ b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm); gtk_box_pack_end(GTK_BOX(buttons), b->cancel, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); b->save = picture_button(b->window, _("Save"), save_xpm); gtk_box_pack_end(GTK_BOX(buttons), b->save, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(b->save), "clicked", - GTK_SIGNAL_FUNC(do_save_info), b); + gtk_signal_connect(GTK_OBJECT(b->save), "clicked", GTK_SIGNAL_FUNC(do_save_info), b); gtk_widget_show(b->window); @@ -1781,7 +1736,8 @@ /* The dialog for the info requests */ /*------------------------------------------------------------------------*/ -static void info_dlg_free(GtkWidget *b, struct info_dlg *d) { +static void info_dlg_free(GtkWidget *b, struct info_dlg *d) +{ g_free(d); } @@ -1800,39 +1756,34 @@ void g_show_info_text(char *info, ...) { - GtkWidget *ok; - GtkWidget *label; + GtkWidget *ok; + GtkWidget *label; GtkWidget *text; - GtkWidget *bbox; - GtkWidget *sw; + GtkWidget *bbox; + GtkWidget *sw; gint options = 0; char *more_info; va_list ap; - struct info_dlg *b = g_new0(struct info_dlg, 1); + struct info_dlg *b = g_new0(struct info_dlg, 1); va_start(ap, info); - b->window = gtk_window_new(GTK_WINDOW_DIALOG); + b->window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_title(GTK_WINDOW(b->window), "Gaim"); - gtk_container_border_width(GTK_CONTAINER(b->window), 5); - bbox = gtk_vbox_new(FALSE, 5); + gtk_container_border_width(GTK_CONTAINER(b->window), 5); + bbox = gtk_vbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(b->window), bbox); - gtk_widget_realize(GTK_WIDGET(b->window)); - ok = picture_button(b->window, _("OK"), ok_xpm); - gtk_signal_connect(GTK_OBJECT(b->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); - gtk_signal_connect(GTK_OBJECT(b->window), "destroy", - GTK_SIGNAL_FUNC(info_dlg_free), b); - gtk_signal_connect(GTK_OBJECT(ok), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); - - label = gtk_label_new(_("Below are the results of your search: ")); - - sw = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), - GTK_POLICY_NEVER, - GTK_POLICY_ALWAYS); + gtk_widget_realize(GTK_WIDGET(b->window)); + ok = picture_button(b->window, _("OK"), ok_xpm); + gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(info_dlg_free), b); + gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); + + label = gtk_label_new(_("Below are the results of your search: ")); + + sw = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); text = gtk_imhtml_new(NULL, NULL); b->text = text; gtk_container_add(GTK_CONTAINER(sw), text); @@ -1862,7 +1813,7 @@ options ^= GTK_IMHTML_NO_SCROLL; gtk_imhtml_append_text(GTK_IMHTML(b->text), info, options); while ((more_info = va_arg(ap, char *)) != NULL) - gtk_imhtml_append_text(GTK_IMHTML(b->text), more_info, options); + gtk_imhtml_append_text(GTK_IMHTML(b->text), more_info, options); va_end(ap); gtk_imhtml_append_text(GTK_IMHTML(b->text), "<BR>", 0); @@ -1877,16 +1828,16 @@ static void do_add_perm(GtkWidget *w, struct addperm *p) { - char *who; - char *name; - - - who = gtk_entry_get_text(GTK_ENTRY(p->entry)); - - name = g_malloc(strlen(who) + 2); - g_snprintf(name, strlen(who) + 2, "%s", who); - - if (!p->permit) { + char *who; + char *name; + + + who = gtk_entry_get_text(GTK_ENTRY(p->entry)); + + name = g_malloc(strlen(who) + 2); + g_snprintf(name, strlen(who) + 2, "%s", who); + + if (!p->permit) { GSList *d = p->gc->deny; char *n; n = g_strdup(normalize(name)); @@ -1903,7 +1854,7 @@ do_export(p->gc); } else g_free(name); - } else { + } else { GSList *d = p->gc->permit; char *n; n = g_strdup(normalize(name)); @@ -1920,9 +1871,9 @@ do_export(p->gc); } else g_free(name); - } - - destroy_dialog(NULL, p->window); + } + + destroy_dialog(NULL, p->window); } @@ -1932,16 +1883,16 @@ GtkWidget *cancel; GtkWidget *add; GtkWidget *label; - GtkWidget *bbox; - GtkWidget *vbox; - GtkWidget *topbox; + GtkWidget *bbox; + GtkWidget *vbox; + GtkWidget *topbox; GtkWidget *frame; - + struct addperm *p = g_new0(struct addperm, 1); p->gc = gc; p->permit = permit; - p->window = gtk_window_new(GTK_WINDOW_DIALOG); + p->window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_container_set_border_width(GTK_CONTAINER(p->window), 5); gtk_window_set_policy(GTK_WINDOW(p->window), FALSE, FALSE, TRUE); gtk_widget_realize(p->window); @@ -1949,9 +1900,9 @@ dialogwindows = g_list_prepend(dialogwindows, p->window); bbox = gtk_hbox_new(TRUE, 10); - topbox = gtk_hbox_new(FALSE, 5); - vbox = gtk_vbox_new(FALSE, 5); - p->entry = gtk_entry_new(); + topbox = gtk_hbox_new(FALSE, 5); + vbox = gtk_vbox_new(FALSE, 5); + p->entry = gtk_entry_new(); if (permit) frame = gtk_frame_new(_("Permit")); @@ -1965,54 +1916,50 @@ else add = picture_button(p->window, _("Deny"), add_xpm); cancel = picture_button(p->window, _("Cancel"), cancel_xpm); - + /* End of Cancel Button */ - if (who != NULL) - gtk_entry_set_text(GTK_ENTRY(p->entry), who); - - /* Put the buttons in the box */ - + if (who != NULL) + gtk_entry_set_text(GTK_ENTRY(p->entry), who); + + /* Put the buttons in the box */ + gtk_box_pack_start(GTK_BOX(bbox), add, FALSE, FALSE, 5); - gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5); - - label = gtk_label_new(_("Add")); - gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); - gtk_box_pack_start(GTK_BOX(topbox), p->entry, FALSE, FALSE, 5); - /* And the boxes in the box */ - gtk_box_pack_start(GTK_BOX(vbox), topbox, TRUE, TRUE, 5); - gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5); + gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5); + + label = gtk_label_new(_("Add")); + gtk_widget_show(label); + gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(topbox), p->entry, FALSE, FALSE, 5); + /* And the boxes in the box */ + gtk_box_pack_start(GTK_BOX(vbox), topbox, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5); gtk_container_add(GTK_CONTAINER(frame), vbox); - /* Handle closes right */ - gtk_signal_connect(GTK_OBJECT(p->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), p->window); - gtk_signal_connect(GTK_OBJECT(cancel), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), p->window); - gtk_signal_connect(GTK_OBJECT(add), "clicked", - GTK_SIGNAL_FUNC(do_add_perm), p); - gtk_signal_connect(GTK_OBJECT(p->entry), "activate", - GTK_SIGNAL_FUNC(do_add_perm), p); - - /* Finish up */ - gtk_widget_show(add); - gtk_widget_show(cancel); - gtk_widget_show(p->entry); - gtk_widget_show(topbox); - gtk_widget_show(bbox); - gtk_widget_show(vbox); + /* Handle closes right */ + gtk_signal_connect(GTK_OBJECT(p->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), p->window); + gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), p->window); + gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(do_add_perm), p); + gtk_signal_connect(GTK_OBJECT(p->entry), "activate", GTK_SIGNAL_FUNC(do_add_perm), p); + + /* Finish up */ + gtk_widget_show(add); + gtk_widget_show(cancel); + gtk_widget_show(p->entry); + gtk_widget_show(topbox); + gtk_widget_show(bbox); + gtk_widget_show(vbox); gtk_widget_show(frame); if (permit) gtk_window_set_title(GTK_WINDOW(p->window), _("Gaim - Add Permit")); else gtk_window_set_title(GTK_WINDOW(p->window), _("Gaim - Add Deny")); - gtk_window_set_focus(GTK_WINDOW(p->window), p->entry); - gtk_container_add(GTK_CONTAINER(p->window), frame); - gtk_widget_realize(p->window); - aol_icon(p->window->window); - - gtk_widget_show(p->window); + gtk_window_set_focus(GTK_WINDOW(p->window), p->entry); + gtk_container_add(GTK_CONTAINER(p->window), frame); + gtk_widget_realize(p->window); + aol_icon(p->window->window); + + gtk_widget_show(p->window); } @@ -2021,63 +1968,64 @@ /*------------------------------------------------------------------------*/ void cancel_log(GtkWidget *widget, struct conversation *c) -{ - if (c->wood) - { +{ + if (c->wood) { set_state_lock(1); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->wood), FALSE); set_state_lock(0); } dialogwindows = g_list_remove(dialogwindows, c->log_dialog); gtk_widget_destroy(c->log_dialog); - c->log_dialog = NULL; + c->log_dialog = NULL; } void do_log(GtkWidget *w, struct conversation *c) { - struct log_conversation *l; - char buf[128]; + struct log_conversation *l; + char buf[128]; char *file; char path[PATHSIZE]; - if (!find_log_info(c->name)) { + if (!find_log_info(c->name)) { file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(c->log_dialog)); - strncpy( path, file, PATHSIZE - 1 ); + strncpy(path, file, PATHSIZE - 1); if (file_is_dir(path, c->log_dialog)) { return; } - l = (struct log_conversation *)g_new0(struct log_conversation, 1); - strcpy(l->name, c->name); - strcpy(l->filename, file); - log_conversations = g_list_append(log_conversations, l); - - if (c != NULL) - { - g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, c->name); - gtk_window_set_title(GTK_WINDOW(c->window), buf); - } - } - - save_prefs(); - cancel_log(NULL, c); -} + l = (struct log_conversation *)g_new0(struct log_conversation, 1); + strcpy(l->name, c->name); + strcpy(l->filename, file); + log_conversations = g_list_append(log_conversations, l); + + if (c != NULL) { + g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, c->name); + gtk_window_set_title(GTK_WINDOW(c->window), buf); + } + } + + save_prefs(); + cancel_log(NULL, c); +} void show_log_dialog(struct conversation *c) { char *buf = g_malloc(BUF_LEN); - + if (!c->log_dialog) { c->log_dialog = gtk_file_selection_new(_("Gaim - Log Conversation")); - - gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(c->log_dialog)); - + + gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(c->log_dialog)); + g_snprintf(buf, BUF_LEN - 1, "%s/%s.log", getenv("HOME"), c->name); gtk_object_set_user_data(GTK_OBJECT(c->log_dialog), "log dialog"); gtk_file_selection_set_filename(GTK_FILE_SELECTION(c->log_dialog), buf); - gtk_signal_connect(GTK_OBJECT(c->log_dialog), "delete_event", GTK_SIGNAL_FUNC(delete_event_dialog), c); - gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->log_dialog)->ok_button), "clicked", GTK_SIGNAL_FUNC(do_log), c); - gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->log_dialog)->cancel_button), "clicked", GTK_SIGNAL_FUNC(cancel_log), c); + gtk_signal_connect(GTK_OBJECT(c->log_dialog), "delete_event", + GTK_SIGNAL_FUNC(delete_event_dialog), c); + gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->log_dialog)->ok_button), "clicked", + GTK_SIGNAL_FUNC(do_log), c); + gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->log_dialog)->cancel_button), + "clicked", GTK_SIGNAL_FUNC(cancel_log), c); } g_free(buf); @@ -2092,7 +2040,7 @@ void do_find_info(GtkWidget *w, struct findbyinfo *b) { - char *first; + char *first; char *middle; char *last; char *maiden; @@ -2100,47 +2048,48 @@ char *state; char *country; - first = gtk_entry_get_text(GTK_ENTRY(b->firstentry)); + first = gtk_entry_get_text(GTK_ENTRY(b->firstentry)); middle = gtk_entry_get_text(GTK_ENTRY(b->middleentry)); last = gtk_entry_get_text(GTK_ENTRY(b->lastentry)); maiden = gtk_entry_get_text(GTK_ENTRY(b->maidenentry)); - city = gtk_entry_get_text(GTK_ENTRY(b->cityentry)); - state = gtk_entry_get_text(GTK_ENTRY(b->stateentry)); - country = gtk_entry_get_text(GTK_ENTRY(b->countryentry)); + city = gtk_entry_get_text(GTK_ENTRY(b->cityentry)); + state = gtk_entry_get_text(GTK_ENTRY(b->stateentry)); + country = gtk_entry_get_text(GTK_ENTRY(b->countryentry)); /* FIXME : dir search. not sure if even works; not important */ if (connections) - serv_dir_search(connections->data, first, middle, last, maiden, city, state, country, ""); - destroy_dialog(NULL, b->window); -} + serv_dir_search(connections->data, first, middle, last, maiden, city, state, country, + ""); + destroy_dialog(NULL, b->window); +} void do_find_email(GtkWidget *w, struct findbyemail *b) { char *email; email = gtk_entry_get_text(GTK_ENTRY(b->emailentry)); - + if (b->gc) - serv_dir_search(b->gc, "","","","","","","", email); + serv_dir_search(b->gc, "", "", "", "", "", "", "", email); else - serv_dir_search(connections->data, "","","","","","","", email); - + serv_dir_search(connections->data, "", "", "", "", "", "", "", email); + destroy_dialog(NULL, b->window); } void show_find_info() { - GtkWidget *cancel; - GtkWidget *ok; - GtkWidget *label; - GtkWidget *bbox; - GtkWidget *vbox; + GtkWidget *cancel; + GtkWidget *ok; + GtkWidget *label; + GtkWidget *bbox; + GtkWidget *vbox; GtkWidget *hbox; GtkWidget *fbox; GtkWidget *frame; struct findbyinfo *b = g_new0(struct findbyinfo, 1); - b->window = gtk_window_new(GTK_WINDOW_DIALOG); + b->window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE); gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_info", "Gaim"); gtk_widget_show(b->window); @@ -2155,11 +2104,11 @@ ok = picture_button(b->window, _("OK"), ok_xpm); cancel = picture_button(b->window, _("Cancel"), cancel_xpm); - bbox = gtk_hbox_new(FALSE, 5); - vbox = gtk_vbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); - - b->firstentry = gtk_entry_new(); + bbox = gtk_hbox_new(FALSE, 5); + vbox = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); + + b->firstentry = gtk_entry_new(); b->middleentry = gtk_entry_new(); b->lastentry = gtk_entry_new(); b->maidenentry = gtk_entry_new(); @@ -2167,13 +2116,13 @@ b->stateentry = gtk_entry_new(); b->countryentry = gtk_entry_new(); - gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0); - gtk_box_pack_end(GTK_BOX(bbox), ok, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(bbox), ok, FALSE, FALSE, 0); /* Line 1 */ - label = gtk_label_new(_("First Name")); + label = gtk_label_new(_("First Name")); gtk_widget_show(label); - + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->firstentry, FALSE, FALSE, 0); @@ -2183,9 +2132,9 @@ /* Line 2 */ - label = gtk_label_new(_("Middle Name")); - gtk_widget_show(label); - + label = gtk_label_new(_("Middle Name")); + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->middleentry, FALSE, FALSE, 0); @@ -2196,8 +2145,8 @@ /* Line 3 */ label = gtk_label_new(_("Last Name")); - gtk_widget_show(label); - + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->lastentry, FALSE, FALSE, 0); @@ -2208,8 +2157,8 @@ /* Line 4 */ label = gtk_label_new(_("Maiden Name")); - gtk_widget_show(label); - + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->maidenentry, FALSE, FALSE, 0); @@ -2218,10 +2167,10 @@ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); /* Line 5 */ - + label = gtk_label_new(_("City")); - gtk_widget_show(label); - + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->cityentry, FALSE, FALSE, 0); @@ -2230,9 +2179,9 @@ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); /* Line 6 */ - label = gtk_label_new(_("State")); - gtk_widget_show(label); - + label = gtk_label_new(_("State")); + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->stateentry, FALSE, FALSE, 0); @@ -2241,9 +2190,9 @@ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); /* Line 7 */ - label = gtk_label_new(_("Country")); - gtk_widget_show(label); - + label = gtk_label_new(_("Country")); + gtk_widget_show(label); + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(hbox), b->countryentry, FALSE, FALSE, 0); @@ -2251,99 +2200,92 @@ gtk_widget_show(hbox); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - /* Merge The Boxes */ + /* Merge The Boxes */ gtk_container_add(GTK_CONTAINER(frame), vbox); gtk_box_pack_start(GTK_BOX(fbox), frame, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(fbox), bbox, FALSE, FALSE, 0); - gtk_signal_connect(GTK_OBJECT(b->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); - gtk_signal_connect(GTK_OBJECT(cancel), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); - gtk_signal_connect(GTK_OBJECT(ok), "clicked", - GTK_SIGNAL_FUNC(do_find_info), b); - - gtk_widget_show(ok); - gtk_widget_show(cancel); - gtk_widget_show(b->firstentry); + gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(do_find_info), b); + + gtk_widget_show(ok); + gtk_widget_show(cancel); + gtk_widget_show(b->firstentry); gtk_widget_show(b->middleentry); gtk_widget_show(b->lastentry); gtk_widget_show(b->maidenentry); gtk_widget_show(b->cityentry); gtk_widget_show(b->stateentry); gtk_widget_show(b->countryentry); - gtk_widget_show(bbox); - gtk_widget_show(vbox); + gtk_widget_show(bbox); + gtk_widget_show(vbox); gtk_widget_show(frame); gtk_widget_show(fbox); - gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Find Buddy By Info")); - gtk_window_set_focus(GTK_WINDOW(b->window), b->firstentry); - gtk_container_add(GTK_CONTAINER(b->window), fbox); - gtk_container_border_width(GTK_CONTAINER(b->window), 5); - gtk_widget_realize(b->window); - aol_icon(b->window->window); - - gtk_widget_show(b->window); -} + gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Find Buddy By Info")); + gtk_window_set_focus(GTK_WINDOW(b->window), b->firstentry); + gtk_container_add(GTK_CONTAINER(b->window), fbox); + gtk_container_border_width(GTK_CONTAINER(b->window), 5); + gtk_widget_realize(b->window); + aol_icon(b->window->window); + + gtk_widget_show(b->window); +} void show_find_email(struct gaim_connection *gc) { - GtkWidget *label; - GtkWidget *bbox; - GtkWidget *vbox; - GtkWidget *frame; - GtkWidget *topbox; + GtkWidget *label; + GtkWidget *bbox; + GtkWidget *vbox; + GtkWidget *frame; + GtkWidget *topbox; GtkWidget *button; - struct findbyemail *b = g_new0(struct findbyemail, 1); + struct findbyemail *b = g_new0(struct findbyemail, 1); if (g_slist_find(connections, gc)) b->gc = gc; - b->window = gtk_window_new(GTK_WINDOW_DIALOG); + b->window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE); gtk_window_set_wmclass(GTK_WINDOW(b->window), "find_email", "Gaim"); - gtk_widget_realize(b->window); - aol_icon(b->window->window); - dialogwindows = g_list_prepend(dialogwindows, b->window); - gtk_signal_connect(GTK_OBJECT(b->window), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); - gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Find Buddy By Email")); - - vbox = gtk_vbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); - gtk_container_add(GTK_CONTAINER(b->window), vbox); + gtk_widget_realize(b->window); + aol_icon(b->window->window); + dialogwindows = g_list_prepend(dialogwindows, b->window); + gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Find Buddy By Email")); + + vbox = gtk_vbox_new(FALSE, 5); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); + gtk_container_add(GTK_CONTAINER(b->window), vbox); frame = gtk_frame_new(_("Search for Buddy")); - gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); - - topbox = gtk_hbox_new(FALSE, 5); - gtk_container_add(GTK_CONTAINER(frame), topbox); - gtk_container_set_border_width(GTK_CONTAINER(topbox), 5); - - label = gtk_label_new(_("Email")); - gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 0); - - b->emailentry = gtk_entry_new(); - gtk_box_pack_start(GTK_BOX(topbox), b->emailentry, TRUE, TRUE, 0); - gtk_signal_connect(GTK_OBJECT(b->emailentry), "activate", - GTK_SIGNAL_FUNC(do_find_email), b); - gtk_window_set_focus(GTK_WINDOW(b->window), b->emailentry); + gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); + + topbox = gtk_hbox_new(FALSE, 5); + gtk_container_add(GTK_CONTAINER(frame), topbox); + gtk_container_set_border_width(GTK_CONTAINER(topbox), 5); + + label = gtk_label_new(_("Email")); + gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 0); + + b->emailentry = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(topbox), b->emailentry, TRUE, TRUE, 0); + gtk_signal_connect(GTK_OBJECT(b->emailentry), "activate", GTK_SIGNAL_FUNC(do_find_email), b); + gtk_window_set_focus(GTK_WINDOW(b->window), b->emailentry); bbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); button = picture_button(b->window, _("Cancel"), cancel_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), b->window); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); button = picture_button(b->window, _("OK"), ok_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(do_find_email), b); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_find_email), b); gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); - gtk_widget_show_all(b->window); + gtk_widget_show_all(b->window); } /*------------------------------------------------------*/ @@ -2356,7 +2298,7 @@ set_state_lock(1); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->link), FALSE); set_state_lock(0); - } + } destroy_dialog(NULL, c->link_dialog); c->link_dialog = NULL; } @@ -2364,13 +2306,13 @@ void do_add_link(GtkWidget *widget, struct linkdlg *b) { char *open_tag; - char *urltext, *showtext; + char *urltext, *showtext; open_tag = g_malloc(2048); urltext = gtk_entry_get_text(GTK_ENTRY(b->url)); - showtext = gtk_entry_get_text(GTK_ENTRY(b->text)); - + showtext = gtk_entry_get_text(GTK_ENTRY(b->text)); + g_snprintf(open_tag, 2048, "<A HREF=\"%s\">%s", urltext, showtext); surround(b->entry, open_tag, "</A>"); @@ -2391,8 +2333,7 @@ if (!c->link_dialog) { struct linkdlg *b = g_new0(struct linkdlg, 1); c->link_dialog = gtk_window_new(GTK_WINDOW_DIALOG); - gtk_window_set_wmclass(GTK_WINDOW(c->link_dialog), - "add_link", "Gaim"); + gtk_window_set_wmclass(GTK_WINDOW(c->link_dialog), "add_link", "Gaim"); dialogwindows = g_list_prepend(dialogwindows, c->link_dialog); gtk_widget_set_usize(c->link_dialog, 270, 165); @@ -2426,7 +2367,7 @@ gtk_widget_show(label); gtk_widget_show(hbox); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); - + hbox = gtk_hbox_new(FALSE, 5); label = gtk_label_new(_("Description")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5); @@ -2434,7 +2375,7 @@ gtk_widget_show(label); gtk_widget_show(hbox); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); - + gtk_widget_show(b->url); gtk_widget_show(b->text); gtk_widget_show(frame); @@ -2447,19 +2388,17 @@ gtk_signal_connect(GTK_OBJECT(c->link_dialog), "destroy", GTK_SIGNAL_FUNC(cancel_link), c); - gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", - GTK_SIGNAL_FUNC(cancel_link), c); - gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", - GTK_SIGNAL_FUNC(do_add_link), b); - - gtk_container_add(GTK_CONTAINER(c->link_dialog ), fbox); - gtk_container_border_width(GTK_CONTAINER(c->link_dialog ), 10); - gtk_window_set_title(GTK_WINDOW(c->link_dialog ), _("GAIM - Add URL")); - gtk_window_set_focus(GTK_WINDOW(c->link_dialog ), b->url); + gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(cancel_link), c); + gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", GTK_SIGNAL_FUNC(do_add_link), b); + + gtk_container_add(GTK_CONTAINER(c->link_dialog), fbox); + gtk_container_border_width(GTK_CONTAINER(c->link_dialog), 10); + gtk_window_set_title(GTK_WINDOW(c->link_dialog), _("GAIM - Add URL")); + gtk_window_set_focus(GTK_WINDOW(c->link_dialog), b->url); b->window = c->link_dialog; b->toggle = linky; b->entry = c->entry; - gtk_widget_realize(c->link_dialog); + gtk_widget_realize(c->link_dialog); aol_icon(c->link_dialog->window); } @@ -2478,8 +2417,7 @@ void cancel_fgcolor(GtkWidget *widget, struct conversation *c) { - if (c->fgcolorbtn && widget) - { + if (c->fgcolorbtn && widget) { set_state_lock(1); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->fgcolorbtn), FALSE); set_state_lock(0); @@ -2491,8 +2429,7 @@ void cancel_bgcolor(GtkWidget *widget, struct conversation *c) { - if (c->bgcolorbtn && widget) - { + if (c->bgcolorbtn && widget) { set_state_lock(1); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->bgcolorbtn), FALSE); set_state_lock(0); @@ -2511,18 +2448,19 @@ open_tag = g_malloc(30); - gtk_color_selection_get_color (colorsel, color); + gtk_color_selection_get_color(colorsel, color); c = gtk_object_get_user_data(GTK_OBJECT(colorsel)); /* GTK_IS_EDITABLE(c->entry); huh? */ - text_color.red = ((guint16)(color[0]*65535))>>8; - text_color.green = ((guint16)(color[1]*65535))>>8; - text_color.blue = ((guint16)(color[2]*65535))>>8; - + text_color.red = ((guint16)(color[0] * 65535)) >> 8; + text_color.green = ((guint16)(color[1] * 65535)) >> 8; + text_color.blue = ((guint16)(color[2] * 65535)) >> 8; + c->fgcol = text_color; c->hasfg = 1; - g_snprintf(open_tag, 23, "<FONT COLOR=\"#%02X%02X%02X\">", text_color.red, text_color.green, text_color.blue); + g_snprintf(open_tag, 23, "<FONT COLOR=\"#%02X%02X%02X\">", text_color.red, text_color.green, + text_color.blue); surround(c->entry, open_tag, "</FONT>"); debug_printf("#%02X%02X%02X\n", text_color.red, text_color.green, text_color.blue); g_free(open_tag); @@ -2538,18 +2476,19 @@ open_tag = g_malloc(30); - gtk_color_selection_get_color (colorsel, color); + gtk_color_selection_get_color(colorsel, color); c = gtk_object_get_user_data(GTK_OBJECT(colorsel)); /* GTK_IS_EDITABLE(c->entry); huh? */ - text_color.red = ((guint16)(color[0]*65535))>>8; - text_color.green = ((guint16)(color[1]*65535))>>8; - text_color.blue = ((guint16)(color[2]*65535))>>8; - + text_color.red = ((guint16)(color[0] * 65535)) >> 8; + text_color.green = ((guint16)(color[1] * 65535)) >> 8; + text_color.blue = ((guint16)(color[2] * 65535)) >> 8; + c->bgcol = text_color; c->hasbg = 1; - g_snprintf(open_tag, 25, "<BODY BGCOLOR=\"#%02X%02X%02X\">", text_color.red, text_color.green, text_color.blue); + g_snprintf(open_tag, 25, "<BODY BGCOLOR=\"#%02X%02X%02X\">", text_color.red, text_color.green, + text_color.blue); surround(c->entry, open_tag, "</BODY>"); debug_printf("#%02X%02X%02X\n", text_color.red, text_color.green, text_color.blue); g_free(open_tag); @@ -2571,21 +2510,23 @@ { gdouble color[3]; if ((int)d == 1) { - gtk_color_selection_get_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), color); + gtk_color_selection_get_color(GTK_COLOR_SELECTION + (GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), color); destroy_colorsel(NULL, (void *)1); - fgcolor.red = ((guint16)(color[0]*65535))>>8; - fgcolor.green = ((guint16)(color[1]*65535))>>8; - fgcolor.blue = ((guint16)(color[2]*65535))>>8; + fgcolor.red = ((guint16)(color[0] * 65535)) >> 8; + fgcolor.green = ((guint16)(color[1] * 65535)) >> 8; + fgcolor.blue = ((guint16)(color[2] * 65535)) >> 8; update_color(NULL, pref_fg_picture); update_convo_color(TRUE); } else { - gtk_color_selection_get_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), color); + gtk_color_selection_get_color(GTK_COLOR_SELECTION + (GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), color); destroy_colorsel(NULL, (void *)0); - bgcolor.red = ((guint16)(color[0]*65535))>>8; - bgcolor.green = ((guint16)(color[1]*65535))>>8; - bgcolor.blue = ((guint16)(color[2]*65535))>>8; + bgcolor.red = ((guint16)(color[0] * 65535)) >> 8; + bgcolor.green = ((guint16)(color[1] * 65535)) >> 8; + bgcolor.blue = ((guint16)(color[2] * 65535)) >> 8; update_color(NULL, pref_bg_picture); update_convo_color(FALSE); } @@ -2596,17 +2537,22 @@ GtkWidget *colorsel; gdouble fgclr[3]; - if (color == NULL) { /* we came from the prefs */ - if (fgcseld) return; - fgclr[0]=(gdouble)(fgcolor.red)/255; - fgclr[1]=(gdouble)(fgcolor.green)/255; - fgclr[2]=(gdouble)(fgcolor.blue)/255; + if (color == NULL) { /* we came from the prefs */ + if (fgcseld) + return; + fgclr[0] = (gdouble)(fgcolor.red) / 255; + fgclr[1] = (gdouble)(fgcolor.green) / 255; + fgclr[2] = (gdouble)(fgcolor.blue) / 255; fgcseld = gtk_color_selection_dialog_new(_("Select Text Color")); - gtk_color_selection_set_color (GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), fgclr); - gtk_signal_connect(GTK_OBJECT(fgcseld), "delete_event", GTK_SIGNAL_FUNC(destroy_colorsel), (void *)1); - gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->cancel_button), "clicked", GTK_SIGNAL_FUNC(destroy_colorsel), (void *)1); - gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->ok_button), "clicked", GTK_SIGNAL_FUNC(apply_color_dlg), (void *)1); + gtk_color_selection_set_color(GTK_COLOR_SELECTION + (GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), fgclr); + gtk_signal_connect(GTK_OBJECT(fgcseld), "delete_event", + GTK_SIGNAL_FUNC(destroy_colorsel), (void *)1); + gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->cancel_button), + "clicked", GTK_SIGNAL_FUNC(destroy_colorsel), (void *)1); + gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->ok_button), "clicked", + GTK_SIGNAL_FUNC(apply_color_dlg), (void *)1); gtk_widget_realize(fgcseld); aol_icon(fgcseld->window); gtk_widget_show(fgcseld); @@ -2615,18 +2561,22 @@ } if (!c->fg_color_dialog) { - fgclr[0]=(gdouble)(c->fgcol.red)/255; - fgclr[1]=(gdouble)(c->fgcol.green)/255; - fgclr[2]=(gdouble)(c->fgcol.blue)/255; + fgclr[0] = (gdouble)(c->fgcol.red) / 255; + fgclr[1] = (gdouble)(c->fgcol.green) / 255; + fgclr[2] = (gdouble)(c->fgcol.blue) / 255; c->fg_color_dialog = gtk_color_selection_dialog_new(_("Select Text Color")); colorsel = GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->colorsel; - gtk_color_selection_set_color (GTK_COLOR_SELECTION(colorsel), fgclr); + gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), fgclr); gtk_object_set_user_data(GTK_OBJECT(colorsel), c); - gtk_signal_connect(GTK_OBJECT(c->fg_color_dialog), "delete_event", GTK_SIGNAL_FUNC(delete_event_dialog), c); - gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->ok_button), "clicked", GTK_SIGNAL_FUNC(do_fgcolor), colorsel); - gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->cancel_button), "clicked", GTK_SIGNAL_FUNC(cancel_fgcolor), c); + gtk_signal_connect(GTK_OBJECT(c->fg_color_dialog), "delete_event", + GTK_SIGNAL_FUNC(delete_event_dialog), c); + gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->ok_button), + "clicked", GTK_SIGNAL_FUNC(do_fgcolor), colorsel); + gtk_signal_connect(GTK_OBJECT + (GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->cancel_button), + "clicked", GTK_SIGNAL_FUNC(cancel_fgcolor), c); gtk_widget_realize(c->fg_color_dialog); aol_icon(c->fg_color_dialog->window); @@ -2641,17 +2591,22 @@ GtkWidget *colorsel; gdouble bgclr[3]; - if (color == NULL) { /* we came from the prefs */ - if (bgcseld) return; - bgclr[0]=(gdouble)(bgcolor.red)/255; - bgclr[1]=(gdouble)(bgcolor.green)/255; - bgclr[2]=(gdouble)(bgcolor.blue)/255; + if (color == NULL) { /* we came from the prefs */ + if (bgcseld) + return; + bgclr[0] = (gdouble)(bgcolor.red) / 255; + bgclr[1] = (gdouble)(bgcolor.green) / 255; + bgclr[2] = (gdouble)(bgcolor.blue) / 255; bgcseld = gtk_color_selection_dialog_new(_("Select Background Color")); - gtk_color_selection_set_color (GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), bgclr); - gtk_signal_connect(GTK_OBJECT(bgcseld), "delete_event", GTK_SIGNAL_FUNC(destroy_colorsel), NULL); - gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->cancel_button), "clicked", GTK_SIGNAL_FUNC(destroy_colorsel), NULL); - gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->ok_button), "clicked", GTK_SIGNAL_FUNC(apply_color_dlg), (void *)2); + gtk_color_selection_set_color(GTK_COLOR_SELECTION + (GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), bgclr); + gtk_signal_connect(GTK_OBJECT(bgcseld), "delete_event", + GTK_SIGNAL_FUNC(destroy_colorsel), NULL); + gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->cancel_button), + "clicked", GTK_SIGNAL_FUNC(destroy_colorsel), NULL); + gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->ok_button), "clicked", + GTK_SIGNAL_FUNC(apply_color_dlg), (void *)2); gtk_widget_realize(bgcseld); aol_icon(bgcseld->window); gtk_widget_show(bgcseld); @@ -2660,18 +2615,22 @@ } if (!c->bg_color_dialog) { - bgclr[0]=(gdouble)(c->bgcol.red)/255; - bgclr[1]=(gdouble)(c->bgcol.green)/255; - bgclr[2]=(gdouble)(c->bgcol.blue)/255; + bgclr[0] = (gdouble)(c->bgcol.red) / 255; + bgclr[1] = (gdouble)(c->bgcol.green) / 255; + bgclr[2] = (gdouble)(c->bgcol.blue) / 255; c->bg_color_dialog = gtk_color_selection_dialog_new(_("Select Text Color")); colorsel = GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->colorsel; - gtk_color_selection_set_color (GTK_COLOR_SELECTION(colorsel), bgclr); + gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), bgclr); gtk_object_set_user_data(GTK_OBJECT(colorsel), c); - gtk_signal_connect(GTK_OBJECT(c->bg_color_dialog), "delete_event", GTK_SIGNAL_FUNC(delete_event_dialog), c); - gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->ok_button), "clicked", GTK_SIGNAL_FUNC(do_bgcolor), colorsel); - gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->cancel_button), "clicked", GTK_SIGNAL_FUNC(cancel_bgcolor), c); + gtk_signal_connect(GTK_OBJECT(c->bg_color_dialog), "delete_event", + GTK_SIGNAL_FUNC(delete_event_dialog), c); + gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->ok_button), + "clicked", GTK_SIGNAL_FUNC(do_bgcolor), colorsel); + gtk_signal_connect(GTK_OBJECT + (GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->cancel_button), + "clicked", GTK_SIGNAL_FUNC(cancel_bgcolor), c); gtk_widget_realize(c->bg_color_dialog); aol_icon(c->bg_color_dialog->window); @@ -2686,16 +2645,15 @@ /*------------------------------------------------------------------------*/ void cancel_font(GtkWidget *widget, struct conversation *c) -{ - if (c->font && widget) - { +{ + if (c->font && widget) { set_state_lock(1); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->font), FALSE); set_state_lock(0); } dialogwindows = g_list_remove(dialogwindows, c->font_dialog); gtk_widget_destroy(c->font_dialog); - c->font_dialog = NULL; + c->font_dialog = NULL; } void apply_font(GtkWidget *widget, GtkFontSelection *fontsel) @@ -2706,19 +2664,15 @@ char *fontname; char font[64]; struct conversation *c = gtk_object_get_user_data(GTK_OBJECT(fontsel)); - - if (c) - { + + if (c) { fontname = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(fontsel)); - for (i = 0; i < strlen(fontname); i++) - { - if (fontname[i] == '-') - { + for (i = 0; i < strlen(fontname); i++) { + if (fontname[i] == '-') { if (++j > 2) - break; - } - else if (j == 2) + break; + } else if (j == 2) font[k++] = fontname[i]; } font[k] = '\0'; @@ -2726,35 +2680,32 @@ debug_printf("Setting font face %s\n", font); set_font_face(font, c); - } - else - { + } else { fontname = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(fontsel)); - - for (i = 0; i < strlen(fontname); i++) - { - if (fontname[i] == '-') - { + + for (i = 0; i < strlen(fontname); i++) { + if (fontname[i] == '-') { if (++j > 2) - break; - } - else if (j == 2) + break; + } else if (j == 2) fontface[k++] = fontname[i]; } fontface[k] = '\0'; } - + cancel_font(NULL, c); } static GtkWidget *fontseld; -void destroy_fontsel(GtkWidget *w, gpointer d) { +void destroy_fontsel(GtkWidget *w, gpointer d) +{ gtk_widget_destroy(fontseld); fontseld = NULL; } -void apply_font_dlg(GtkWidget *w, GtkWidget *f) { +void apply_font_dlg(GtkWidget *w, GtkWidget *f) +{ int i, j = 0, k = 0; char *fontname; @@ -2762,7 +2713,8 @@ destroy_fontsel(0, 0); for (i = 0; i < strlen(fontname); i++) { if (fontname[i] == '-') { - if (++j > 2) break; + if (++j > 2) + break; } else if (j == 2) fontface[k++] = fontname[i]; } @@ -2773,43 +2725,52 @@ void show_font_dialog(struct conversation *c, GtkWidget *font) { - if (!font) { /* we came from the prefs dialog */ - if (fontseld) return; + if (!font) { /* we came from the prefs dialog */ + if (fontseld) + return; fontseld = gtk_font_selection_dialog_new(_("Select Font")); - gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld), DEFAULT_FONT_NAME); + gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld), + DEFAULT_FONT_NAME); gtk_object_set_user_data(GTK_OBJECT(fontseld), NULL); - gtk_signal_connect(GTK_OBJECT(fontseld), "delete_event", GTK_SIGNAL_FUNC(destroy_fontsel), NULL); - gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->cancel_button), "clicked", GTK_SIGNAL_FUNC(destroy_fontsel), NULL); - gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->ok_button), "clicked", GTK_SIGNAL_FUNC(apply_font_dlg), NULL); + gtk_signal_connect(GTK_OBJECT(fontseld), "delete_event", + GTK_SIGNAL_FUNC(destroy_fontsel), NULL); + gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->cancel_button), + "clicked", GTK_SIGNAL_FUNC(destroy_fontsel), NULL); + gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->ok_button), "clicked", + GTK_SIGNAL_FUNC(apply_font_dlg), NULL); gtk_widget_realize(fontseld); aol_icon(fontseld->window); gtk_widget_show(fontseld); gdk_window_raise(fontseld->window); return; } - - if (!c->font_dialog) - { + + if (!c->font_dialog) { c->font_dialog = gtk_font_selection_dialog_new(_("Select Font")); if (font) gtk_object_set_user_data(GTK_OBJECT(c->font_dialog), c); else gtk_object_set_user_data(GTK_OBJECT(c->font_dialog), NULL); - - gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *)c->font_dialog, DEFAULT_FONT_NAME); - - gtk_signal_connect(GTK_OBJECT(c->font_dialog), "delete_event", GTK_SIGNAL_FUNC(delete_event_dialog), c); - gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(c->font_dialog)->ok_button), "clicked", GTK_SIGNAL_FUNC(apply_font), c->font_dialog); - gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(c->font_dialog)->cancel_button), "clicked", GTK_SIGNAL_FUNC(cancel_font), c); - - gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *)c->font_dialog, DEFAULT_FONT_NAME); - + + gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *) c->font_dialog, + DEFAULT_FONT_NAME); + + gtk_signal_connect(GTK_OBJECT(c->font_dialog), "delete_event", + GTK_SIGNAL_FUNC(delete_event_dialog), c); + gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(c->font_dialog)->ok_button), + "clicked", GTK_SIGNAL_FUNC(apply_font), c->font_dialog); + gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(c->font_dialog)->cancel_button), + "clicked", GTK_SIGNAL_FUNC(cancel_font), c); + + gtk_font_selection_dialog_set_font_name((GtkFontSelectionDialog *) c->font_dialog, + DEFAULT_FONT_NAME); + gtk_widget_realize(c->font_dialog); - + aol_icon(c->font_dialog->window); - } + } gtk_widget_show(c->font_dialog); gdk_window_raise(c->font_dialog->window); } @@ -2836,8 +2797,7 @@ /* see if a buddy list cache file for this user exists */ -gboolean -bud_list_cache_exists(struct gaim_connection *gc) +gboolean bud_list_cache_exists(struct gaim_connection *gc) { gboolean ret = FALSE; char path[PATHSIZE]; @@ -2848,10 +2808,10 @@ g_screenname = get_screenname_filename(gc->username); file = gaim_user_dir(); - if ( file != (char *) NULL ) { + if (file != (char *)NULL) { g_snprintf(path, sizeof path, "%s/%s.%d.blist", file, g_screenname, - (gc->protocol == PROTO_OSCAR) ? PROTO_TOC : gc->protocol); - if ( !stat(path, &sbuf) ) { + (gc->protocol == PROTO_OSCAR) ? PROTO_TOC : gc->protocol); + if (!stat(path, &sbuf)) { debug_printf("%s exists.\n", path); ret = TRUE; } else { @@ -2878,35 +2838,36 @@ void do_export(struct gaim_connection *g) { FILE *dir; - FILE *f; - char buf[32 * 1024]; - char *file; + FILE *f; + char buf[32 * 1024]; + char *file; char path[PATHSIZE]; char *g_screenname; /* - if ( show_dialog == 1 ) { - file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(exportdialog)); - strncpy( path, file, PATHSIZE - 1 ); - if (file_is_dir(path, exportdialog)) { - return; - } - if ((f = fopen(path,"w"))) { - toc_build_config(connections->data, buf, 8192 - 1, TRUE); - fprintf(f, "%s\n", buf); - fclose(f); - chmod(buf, S_IRUSR | S_IWUSR); - } else { - g_snprintf(buf, BUF_LONG / 2, _("Error writing file %s"), file); - do_error_dialog(buf, _("Error")); - } - destroy_dialog(NULL, exportdialog); - exportdialog = NULL; - } else { - */ + if ( show_dialog == 1 ) { + file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(exportdialog)); + strncpy( path, file, PATHSIZE - 1 ); + if (file_is_dir(path, exportdialog)) { + return; + } + if ((f = fopen(path,"w"))) { + toc_build_config(connections->data, buf, 8192 - 1, TRUE); + fprintf(f, "%s\n", buf); + fclose(f); + chmod(buf, S_IRUSR | S_IWUSR); + } else { + g_snprintf(buf, BUF_LONG / 2, _("Error writing file %s"), file); + do_error_dialog(buf, _("Error")); + } + destroy_dialog(NULL, exportdialog); + exportdialog = NULL; + } else { + */ file = gaim_user_dir(); - if (!file) return; + if (!file) + return; strcpy(buf, file); dir = fopen(buf, "r"); @@ -2918,8 +2879,8 @@ g_screenname = get_screenname_filename(g->username); sprintf(path, "%s/%s.%d.blist", file, g_screenname, - (g->protocol == PROTO_OSCAR) ? PROTO_TOC : g->protocol); - if ((f = fopen(path,"w"))) { + (g->protocol == PROTO_OSCAR) ? PROTO_TOC : g->protocol); + if ((f = fopen(path, "w"))) { debug_printf("writing %s\n", path); toc_build_config(g, buf, 8192 - 1, TRUE); fprintf(f, "%s\n", buf); @@ -2970,27 +2931,27 @@ void do_import(GtkWidget *w, struct gaim_connection *gc) { - char *buf = g_malloc(BUF_LONG * 2); - char *buf2; - char *first = g_malloc(64); + char *buf = g_malloc(BUF_LONG * 2); + char *buf2; + char *first = g_malloc(64); char *file; char path[PATHSIZE]; char *g_screenname; int len; - FILE *f; + FILE *f; gboolean from_dialog = FALSE; - if ( !gc ) { + if (!gc) { debug_printf("want to import file "); file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(importdialog)); debug_printf("%s", file); if (file_is_dir(file, importdialog)) { debug_printf(" but it is a directory\n"); - g_free (buf); - g_free (first); + g_free(buf); + g_free(first); return; } - strncpy( path, file, PATHSIZE - 1 ); + strncpy(path, file, PATHSIZE - 1); /* FIXME : import buddy list file. moderately important */ gc = connections->data; from_dialog = TRUE; @@ -2998,9 +2959,9 @@ g_screenname = get_screenname_filename(gc->username); file = gaim_user_dir(); - if ( file != (char *) NULL ) { - sprintf( path, "%s/%s.%d.blist", file, g_screenname, - (gc->protocol == PROTO_OSCAR) ? PROTO_TOC : gc->protocol); + if (file != (char *)NULL) { + sprintf(path, "%s/%s.%d.blist", file, g_screenname, + (gc->protocol == PROTO_OSCAR) ? PROTO_TOC : gc->protocol); g_free(file); g_free(g_screenname); } else { @@ -3011,78 +2972,78 @@ } } - if (!(f = fopen(path,"r"))) { + if (!(f = fopen(path, "r"))) { if (from_dialog) { debug_printf(" but it can't be opened\n"); - g_snprintf(buf, BUF_LONG / 2, _("Error reading file %s"), path); - do_error_dialog(buf, _("Error")); - destroy_dialog(NULL, importdialog); - importdialog = NULL; + g_snprintf(buf, BUF_LONG / 2, _("Error reading file %s"), path); + do_error_dialog(buf, _("Error")); + destroy_dialog(NULL, importdialog); + importdialog = NULL; } debug_printf("Unable to open %s.\n", path); - g_free(buf); + g_free(buf); g_free(first); - return; + return; } - - fgets(first, 64, f); + + fgets(first, 64, f); /* AIM 4 buddy list */ if (!g_strncasecmp(first, "Config {", strlen("Config {"))) { debug_printf("aim 4\n"); rewind(f); - translate_blt (f, buf); + translate_blt(f, buf); debug_printf("%s\n", buf); buf2 = buf; buf = g_malloc(8193); - g_snprintf(buf, 8192, "toc_set_config {%s}\n", buf2); - g_free(buf2); - /* AIM 3 buddy list */ + g_snprintf(buf, 8192, "toc_set_config {%s}\n", buf2); + g_free(buf2); + /* AIM 3 buddy list */ } else if (strstr(first, "group") != NULL) { debug_printf("aim 3\n"); rewind(f); - translate_lst (f, buf); + translate_lst(f, buf); debug_printf("%s\n", buf); buf2 = buf; buf = g_malloc(8193); - g_snprintf(buf, 8192, "toc_set_config {%s}\n", buf2); - g_free(buf2); - /* GAIM buddy list - no translation */ - } else if (first[0] == 'm') { + g_snprintf(buf, 8192, "toc_set_config {%s}\n", buf2); + g_free(buf2); + /* GAIM buddy list - no translation */ + } else if (first[0] == 'm') { rewind(f); len = fread(buf, 1, BUF_LONG * 2, f); buf[len] = '\0'; buf2 = buf; buf = g_malloc(8193); - g_snprintf(buf, 8192, "toc_set_config {%s}\n", buf2); - g_free(buf2); - /* Something else */ - } else { + g_snprintf(buf, 8192, "toc_set_config {%s}\n", buf2); + g_free(buf2); + /* Something else */ + } else { if (from_dialog) { debug_printf(" but I don't recognize the format\n"); - destroy_dialog(NULL, importdialog); - importdialog = NULL; + destroy_dialog(NULL, importdialog); + importdialog = NULL; } g_free(buf); g_free(first); - fclose( f ); - return; + fclose(f); + return; } if (from_dialog) debug_printf("\n"); - parse_toc_buddy_list(gc, buf, 1); - - fclose( f ); - - if ( from_dialog ) { + parse_toc_buddy_list(gc, buf, 1); + + fclose(f); + + if (from_dialog) { /* save what we just did to cache */ do_export(gc); - destroy_dialog(NULL, importdialog); - importdialog = NULL; - } + destroy_dialog(NULL, importdialog); + importdialog = NULL; + } g_free(buf); g_free(first); @@ -3090,29 +3051,29 @@ void show_import_dialog() { - char *buf = g_malloc(BUF_LEN); - if (!importdialog) { - importdialog = gtk_file_selection_new(_("Gaim - Import Buddy List")); - - gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(importdialog)); - - g_snprintf(buf, BUF_LEN - 1, "%s/", getenv("HOME")); - - gtk_file_selection_set_filename(GTK_FILE_SELECTION(importdialog), buf); - gtk_signal_connect(GTK_OBJECT(importdialog), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), importdialog); - - gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(importdialog)->ok_button), - "clicked", GTK_SIGNAL_FUNC(do_import), NULL); - gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(importdialog)->cancel_button), - "clicked", GTK_SIGNAL_FUNC(destroy_dialog), importdialog); - - - } + char *buf = g_malloc(BUF_LEN); + if (!importdialog) { + importdialog = gtk_file_selection_new(_("Gaim - Import Buddy List")); + + gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(importdialog)); + + g_snprintf(buf, BUF_LEN - 1, "%s/", getenv("HOME")); + + gtk_file_selection_set_filename(GTK_FILE_SELECTION(importdialog), buf); + gtk_signal_connect(GTK_OBJECT(importdialog), "destroy", + GTK_SIGNAL_FUNC(destroy_dialog), importdialog); + + gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(importdialog)->ok_button), + "clicked", GTK_SIGNAL_FUNC(do_import), NULL); + gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(importdialog)->cancel_button), + "clicked", GTK_SIGNAL_FUNC(destroy_dialog), importdialog); + + + } g_free(buf); - gtk_widget_show(importdialog); - gdk_window_raise(importdialog->window); + gtk_widget_show(importdialog); + gdk_window_raise(importdialog->window); } @@ -3125,7 +3086,7 @@ struct away_message *am; guint text_len; gchar *away_message; - + if (!ca->mess) am = g_new0(struct away_message, 1); else @@ -3143,24 +3104,23 @@ } save_prefs(); - do_away_menu(); + do_away_menu(); if (prefs_away_list != NULL) gtk_list_select_item(GTK_LIST(prefs_away_list), g_slist_index(away_messages, am)); - + return am; } int check_away_mess(struct create_away *ca, int type) { - if ((strlen(gtk_entry_get_text(GTK_ENTRY(ca->entry))) == 0) && (type == 1)) - { + if ((strlen(gtk_entry_get_text(GTK_ENTRY(ca->entry))) == 0) && (type == 1)) { /* We shouldn't allow a blank title */ - do_error_dialog(_("You cannot create an away message with a blank title"), _("Gaim - Error")); + do_error_dialog(_("You cannot create an away message with a blank title"), + _("Gaim - Error")); return 0; } - if ((gtk_text_get_length(GTK_TEXT(ca->text)) == 0) && (type <= 1)) - { + if ((gtk_text_get_length(GTK_TEXT(ca->text)) == 0) && (type <= 1)) { /* We shouldn't allow a blank message */ do_error_dialog(_("You cannot create an empty away message"), _("Gaim - Error")); return 0; @@ -3184,13 +3144,14 @@ static struct away_message am; guint text_len; gchar *away_message; - + if (!check_away_mess(ca, 0)) return; g_snprintf(am.name, sizeof(am.name), "%s", gtk_entry_get_text(GTK_ENTRY(ca->entry))); text_len = gtk_text_get_length(GTK_TEXT(ca->text)); - if (text_len < 0) return; + if (text_len < 0) + return; away_message = gtk_editable_get_chars(GTK_EDITABLE(ca->text), 0, text_len); g_snprintf(am.message, sizeof(am.message), "%s", away_message); @@ -3210,7 +3171,7 @@ destroy_dialog(NULL, ca->window); g_free(ca); } - + void create_away_mess(GtkWidget *widget, void *dummy) { GtkWidget *hbox; @@ -3222,7 +3183,7 @@ GtkWidget *fbox; GtkWidget *button; - struct create_away *ca = g_new0(struct create_away, 1); + struct create_away *ca = g_new0(struct create_away, 1); /* Set up window */ ca->window = gtk_window_new(GTK_WINDOW_DIALOG); @@ -3230,8 +3191,8 @@ gtk_container_border_width(GTK_CONTAINER(ca->window), 5); gtk_window_set_wmclass(GTK_WINDOW(ca->window), "away_mess", "Gaim"); gtk_window_set_title(GTK_WINDOW(ca->window), _("Gaim - New away message")); - gtk_signal_connect(GTK_OBJECT(ca->window),"delete_event", - GTK_SIGNAL_FUNC(destroy_dialog), ca->window); + gtk_signal_connect(GTK_OBJECT(ca->window), "delete_event", + GTK_SIGNAL_FUNC(destroy_dialog), ca->window); gtk_widget_realize(ca->window); aol_icon(ca->window->window); @@ -3263,8 +3224,7 @@ sw = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start(GTK_BOX(fbox), sw, TRUE, TRUE, 0); gtk_widget_show(sw); @@ -3280,7 +3240,7 @@ int pos = 0; gtk_entry_set_text(GTK_ENTRY(ca->entry), amt->name); gtk_editable_insert_text(GTK_EDITABLE(ca->text), amt->message, - strlen(amt->message), &pos); + strlen(amt->message), &pos); ca->mess = amt; } @@ -3291,35 +3251,34 @@ button = picture_button(ca->window, _("Cancel"), cancel_xpm); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), ca->window); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - + button = picture_button(ca->window, _("Use"), gnome_preferences_xpm); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(use_away_mess), ca); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - + button = picture_button(ca->window, _("Save & Use"), add_xpm); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(su_away_mess), ca); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - + button = picture_button(ca->window, _("Save"), ok_xpm); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(save_away_mess), ca); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); - + gtk_widget_show(ca->window); } /* smiley dialog */ void close_smiley_dialog(GtkWidget *widget, struct conversation *c) -{ - if (c->smiley) - { +{ + if (c->smiley) { set_state_lock(1); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->smiley), FALSE); set_state_lock(0); } dialogwindows = g_list_remove(dialogwindows, c->smiley_dialog); gtk_widget_destroy(c->smiley_dialog); - c->smiley_dialog = NULL; + c->smiley_dialog = NULL; } void set_smiley_array(GtkWidget *widget, int smiley_type) @@ -3328,9 +3287,9 @@ for (i = 0; i < FACE_TOTAL; i++) smiley_array[i] = 0; - + smiley_array[smiley_type] = 1; - + return; } @@ -3338,32 +3297,65 @@ { char *smiley_text; int i; - + for (i = 0; i < FACE_TOTAL; i++) if (smiley_array[i] == 1) break; - switch (i) - { - case (FACE_ANGEL): smiley_text = g_strndup("O:-)", strlen("O:-)")); break; - case (FACE_BIGSMILE): smiley_text = g_strndup(":-D", strlen(":-D")); break; - case (FACE_BURP): smiley_text = g_strndup(":-!", strlen(":-!")); break; - case (FACE_CROSSEDLIPS): smiley_text = g_strndup(":-X", strlen(":-X")); break; - case (FACE_CRY): smiley_text = g_strndup(":'(", strlen(":'(")); break; - case (FACE_EMBARRASSED): smiley_text = g_strndup(":-[", strlen(":-[")); break; - case (FACE_KISS): smiley_text = g_strndup(":-*", strlen(":-*")); break; - case (FACE_MONEYMOUTH): smiley_text = g_strndup(":-$", strlen(":-$")); break; - case (FACE_SAD): smiley_text = g_strndup(":-(", strlen(":-(")); break; - case (FACE_SCREAM): smiley_text = g_strndup("=-O", strlen("=-O")); break; - case (FACE_SMILE): smiley_text = g_strndup(":-)", strlen(":-)")); break; - case (FACE_SMILE8): smiley_text = g_strndup("8-)", strlen("8-)")); break; - case (FACE_THINK): smiley_text = g_strndup(":-/", strlen(":-/")); break; - case (FACE_TONGUE): smiley_text = g_strndup(":-P", strlen(":-p")); break; - case (FACE_WINK): smiley_text = g_strndup(";-)", strlen(";-)")); break; - case (FACE_YELL): smiley_text = g_strndup(">:o", strlen(">:o")); break; - default: smiley_text = g_strndup(":-)", strlen(":-)")); break; + switch (i) { + case (FACE_ANGEL): + smiley_text = g_strndup("O:-)", strlen("O:-)")); + break; + case (FACE_BIGSMILE): + smiley_text = g_strndup(":-D", strlen(":-D")); + break; + case (FACE_BURP): + smiley_text = g_strndup(":-!", strlen(":-!")); + break; + case (FACE_CROSSEDLIPS): + smiley_text = g_strndup(":-X", strlen(":-X")); + break; + case (FACE_CRY): + smiley_text = g_strndup(":'(", strlen(":'(")); + break; + case (FACE_EMBARRASSED): + smiley_text = g_strndup(":-[", strlen(":-[")); + break; + case (FACE_KISS): + smiley_text = g_strndup(":-*", strlen(":-*")); + break; + case (FACE_MONEYMOUTH): + smiley_text = g_strndup(":-$", strlen(":-$")); + break; + case (FACE_SAD): + smiley_text = g_strndup(":-(", strlen(":-(")); + break; + case (FACE_SCREAM): + smiley_text = g_strndup("=-O", strlen("=-O")); + break; + case (FACE_SMILE): + smiley_text = g_strndup(":-)", strlen(":-)")); + break; + case (FACE_SMILE8): + smiley_text = g_strndup("8-)", strlen("8-)")); + break; + case (FACE_THINK): + smiley_text = g_strndup(":-/", strlen(":-/")); + break; + case (FACE_TONGUE): + smiley_text = g_strndup(":-P", strlen(":-p")); + break; + case (FACE_WINK): + smiley_text = g_strndup(";-)", strlen(";-)")); + break; + case (FACE_YELL): + smiley_text = g_strndup(">:o", strlen(">:o")); + break; + default: + smiley_text = g_strndup(":-)", strlen(":-)")); + break; } - + /* surround(c->entry, smiley_text, ""); */ if (GTK_EDITABLE(c->entry)->has_selection) { @@ -3372,18 +3364,18 @@ smiley_text, strlen(smiley_text), &finish); } else { int pos = GTK_EDITABLE(c->entry)->current_pos; - gtk_editable_insert_text(GTK_EDITABLE(c->entry), - smiley_text, strlen(smiley_text), &pos); + gtk_editable_insert_text(GTK_EDITABLE(c->entry), smiley_text, strlen(smiley_text), &pos); } g_free(smiley_text); - + close_smiley_dialog(NULL, c); - + return; } -static void toolbar_add_smiley(struct conversation *c, GtkWidget *bar, char **xpm, GtkWidget *win, int face) +static void toolbar_add_smiley(struct conversation *c, GtkWidget *bar, char **xpm, GtkWidget *win, + int face) { GtkWidget *tpm; GdkBitmap *mask; @@ -3395,13 +3387,15 @@ gtk_widget_show(tpm); gdk_pixmap_unref(dpm); gdk_bitmap_unref(mask); - button = gtk_toolbar_append_element(GTK_TOOLBAR(bar), GTK_TOOLBAR_CHILD_BUTTON, NULL, NULL, NULL, NULL, tpm, GTK_SIGNAL_FUNC(set_smiley_array), (int *)face); + button = + gtk_toolbar_append_element(GTK_TOOLBAR(bar), GTK_TOOLBAR_CHILD_BUTTON, NULL, NULL, NULL, + NULL, tpm, GTK_SIGNAL_FUNC(set_smiley_array), (int *)face); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(insert_smiley_text), c); /* these look really weird with borders */ gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); } - + void show_smiley_dialog(struct conversation *c, GtkWidget *widget) { GtkWidget *dialog; @@ -3413,7 +3407,7 @@ return; win = c->window; - + dialog = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, TRUE); gtk_window_set_wmclass(GTK_WINDOW(dialog), "smiley_dialog", "Gaim"); @@ -3463,13 +3457,13 @@ /* connect signals */ gtk_object_set_user_data(GTK_OBJECT(dialog), "smiley dialog"); gtk_signal_connect(GTK_OBJECT(dialog), "delete_event", GTK_SIGNAL_FUNC(delete_event_dialog), c); - + /* show everything */ gtk_window_set_title(GTK_WINDOW(dialog), _("Smile!")); gtk_widget_show_all(dialog); c->smiley_dialog = dialog; - + return; } @@ -3490,84 +3484,80 @@ GtkWidget *cancel; static GtkWidget *add = NULL; GtkWidget *label; - GtkWidget *topbox; + GtkWidget *topbox; static int a, c; - if (aliasdlg) + if (aliasdlg) gtk_widget_destroy(aliasdlg); - aliasdlg = gtk_window_new(GTK_WINDOW_DIALOG); + aliasdlg = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_policy(GTK_WINDOW(aliasdlg), FALSE, FALSE, TRUE); gtk_window_set_wmclass(GTK_WINDOW(aliasdlg), "alias_dialog", "Gaim"); gtk_widget_realize(aliasdlg); dialogwindows = g_list_prepend(dialogwindows, aliasdlg); bbox = gtk_hbox_new(TRUE, 10); - topbox = gtk_hbox_new(FALSE, 5); - vbox = gtk_vbox_new(FALSE, 5); - - aliasentry = gtk_entry_new(); + topbox = gtk_hbox_new(FALSE, 5); + vbox = gtk_vbox_new(FALSE, 5); + + aliasentry = gtk_entry_new(); aliasname = gtk_entry_new(); - /* Put the buttons in the box */ + /* Put the buttons in the box */ add = picture_button(aliasdlg, _("Alias"), add_xpm); cancel = picture_button(aliasdlg, _("Cancel"), cancel_xpm); - gtk_box_pack_start(GTK_BOX(bbox), add, FALSE, FALSE, 5); - gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(bbox), add, FALSE, FALSE, 5); + gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5); frame = gtk_frame_new(NULL); gtk_frame_set_label(GTK_FRAME(frame), _("Alias Buddy")); - label = gtk_label_new(_("Buddy")); - gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); - gtk_box_pack_start(GTK_BOX(topbox), aliasentry, FALSE, FALSE, 5); + label = gtk_label_new(_("Buddy")); + gtk_widget_show(label); + gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(topbox), aliasentry, FALSE, FALSE, 5); gtk_entry_set_editable(GTK_ENTRY(aliasentry), FALSE); label = gtk_label_new(_("Alias")); gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); - gtk_box_pack_start(GTK_BOX(topbox), aliasname, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(topbox), aliasname, FALSE, FALSE, 5); gtk_entry_set_text(GTK_ENTRY(aliasentry), b->name); gtk_entry_set_text(GTK_ENTRY(aliasname), b->show); - /* And the boxes in the box */ - gtk_box_pack_start(GTK_BOX(vbox), topbox, TRUE, TRUE, 5); - gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 5); - - /* Handle closes right */ - gtk_signal_connect(GTK_OBJECT(aliasdlg), "destroy", - GTK_SIGNAL_FUNC(destroy_dialog), aliasdlg); - gtk_signal_connect(GTK_OBJECT(cancel), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), aliasdlg); - a = gtk_signal_connect(GTK_OBJECT(add), "clicked", - GTK_SIGNAL_FUNC(do_alias_bud), b); - c = gtk_signal_connect(GTK_OBJECT(aliasname), "activate", - GTK_SIGNAL_FUNC(do_alias_bud), b); - /* Finish up */ - gtk_widget_show(add); - gtk_widget_show(cancel); - gtk_widget_show(aliasentry); - gtk_widget_show(aliasname); - gtk_widget_show(topbox); - gtk_widget_show(bbox); - gtk_widget_show(vbox); + /* And the boxes in the box */ + gtk_box_pack_start(GTK_BOX(vbox), topbox, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 5); + + /* Handle closes right */ + gtk_signal_connect(GTK_OBJECT(aliasdlg), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), aliasdlg); + gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), aliasdlg); + a = gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(do_alias_bud), b); + c = gtk_signal_connect(GTK_OBJECT(aliasname), "activate", GTK_SIGNAL_FUNC(do_alias_bud), b); + /* Finish up */ + gtk_widget_show(add); + gtk_widget_show(cancel); + gtk_widget_show(aliasentry); + gtk_widget_show(aliasname); + gtk_widget_show(topbox); + gtk_widget_show(bbox); + gtk_widget_show(vbox); gtk_widget_show(frame); - gtk_window_set_title(GTK_WINDOW(aliasdlg), _("Gaim - Alias Buddy")); - gtk_window_set_focus(GTK_WINDOW(aliasdlg), aliasentry); + gtk_window_set_title(GTK_WINDOW(aliasdlg), _("Gaim - Alias Buddy")); + gtk_window_set_focus(GTK_WINDOW(aliasdlg), aliasentry); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_add(GTK_CONTAINER(aliasdlg), frame); + gtk_container_add(GTK_CONTAINER(aliasdlg), frame); gtk_container_set_border_width(GTK_CONTAINER(aliasdlg), 5); - gtk_widget_realize(aliasdlg); - aol_icon(aliasdlg->window); + gtk_widget_realize(aliasdlg); + aol_icon(aliasdlg->window); gtk_widget_show(aliasdlg); } -static gboolean dont_destroy(gpointer a, gpointer b, gpointer c) +static gboolean dont_destroy(gpointer a, gpointer b, gpointer c) { return TRUE; } @@ -3586,27 +3576,24 @@ name = gtk_object_get_user_data(GTK_OBJECT(filesel)); tmp = gaim_user_dir(); g_snprintf(filename, PATHSIZE, "%s/logs/%s%s", tmp, - name ? normalize(name) : "system", - name ? ".log" : ""); + name ? normalize(name) : "system", name ? ".log" : ""); g_free(tmp); file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel)); - strncpy(path, file, PATHSIZE-1); + strncpy(path, file, PATHSIZE - 1); if (file_is_dir(path, filesel)) return; if ((fp_new = fopen(path, "w")) == NULL) { - g_snprintf(error, BUF_LONG, - "Can't open file %s for writing - %s", - path, strerror(errno)); + g_snprintf(error, BUF_LONG, + "Can't open file %s for writing - %s", path, strerror(errno)); do_error_dialog(error, "Error"); return; } if ((fp_old = fopen(filename, "r")) == NULL) { - g_snprintf(error, BUF_LONG, - "Can't open file %s for reading - %s", - filename, strerror(errno)); + g_snprintf(error, BUF_LONG, + "Can't open file %s for reading - %s", filename, strerror(errno)); do_error_dialog(error, "Error"); fclose(fp_new); return; @@ -3623,14 +3610,13 @@ return; } -static void show_save_log(GtkWidget *w, gchar *name) +static void show_save_log(GtkWidget *w, gchar *name) { GtkWidget *filesel; gchar buf[BUF_LEN]; g_snprintf(buf, BUF_LEN - 1, "%s/%s%s", getenv("HOME"), - name ? normalize(name) : "system", - name ? ".log" : ""); + name ? normalize(name) : "system", name ? ".log" : ""); filesel = gtk_file_selection_new(_("Gaim - Save Log File")); dialogwindows = g_list_prepend(dialogwindows, filesel); @@ -3641,9 +3627,8 @@ gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), buf); gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked", GTK_SIGNAL_FUNC(do_save_log), filesel); - gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), - "clicked", GTK_SIGNAL_FUNC(destroy_dialog), - filesel); + gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), + "clicked", GTK_SIGNAL_FUNC(destroy_dialog), filesel); gtk_object_set_user_data(GTK_OBJECT(filesel), name); gtk_widget_realize(filesel); @@ -3653,7 +3638,7 @@ return; } -static void do_clear_log_file(GtkWidget *w, gchar *name) +static void do_clear_log_file(GtkWidget *w, gchar *name) { gchar buf[256]; gchar filename[256]; @@ -3662,13 +3647,11 @@ tmp = gaim_user_dir(); g_snprintf(filename, 256, "%s/logs/%s%s", tmp, - name ? normalize(name) : "system", - name ? ".log" : ""); + name ? normalize(name) : "system", name ? ".log" : ""); g_free(tmp); if ((remove(filename)) == -1) { - g_snprintf(buf, 256, _("Unable to remove file %s - %s"), - filename, strerror(errno)); + g_snprintf(buf, 256, _("Unable to remove file %s - %s"), filename, strerror(errno)); do_error_dialog(buf, _("Error")); } @@ -3676,7 +3659,7 @@ destroy_dialog(NULL, window); } -static void show_clear_log(GtkWidget *w, gchar *name) +static void show_clear_log(GtkWidget *w, gchar *name) { GtkWidget *window; GtkWidget *box; @@ -3690,8 +3673,7 @@ gtk_window_set_wmclass(GTK_WINDOW(window), "dialog", "Gaim"); gtk_container_set_border_width(GTK_CONTAINER(window), 10); gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE); - gtk_signal_connect(GTK_OBJECT(window), "delete_event", - GTK_SIGNAL_FUNC(destroy_dialog), window); + gtk_signal_connect(GTK_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(destroy_dialog), window); gtk_widget_realize(window); aol_icon(window->window); @@ -3705,22 +3687,18 @@ gtk_box_pack_start(GTK_BOX(box), hsep, FALSE, FALSE, 0); hbox = gtk_hbox_new(FALSE, 0); - gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); button = picture_button(window, _("Cancel"), cancel_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), window); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), window); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); gtk_widget_show(button); button = picture_button(window, _("Okay"), ok_xpm); - gtk_object_set_user_data(GTK_OBJECT(button), - gtk_object_get_user_data(GTK_OBJECT(w))); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(do_clear_log_file), name); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), window); + gtk_object_set_user_data(GTK_OBJECT(button), gtk_object_get_user_data(GTK_OBJECT(w))); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_clear_log_file), name); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), window); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); gtk_widget_show(button); @@ -3729,8 +3707,7 @@ return; } -void -show_log (char *name) +void show_log(char *name) { gchar filename[256]; gchar buf[BUF_LONG]; @@ -3778,7 +3755,7 @@ if (name) g_snprintf(buf, BUF_LONG, "Gaim - Conversations with %s", name); else - g_snprintf(buf, BUF_LONG, "Gaim - System Log" ); + g_snprintf(buf, BUF_LONG, "Gaim - System Log"); gtk_window_set_title(GTK_WINDOW(window), buf); gtk_container_set_border_width(GTK_CONTAINER(window), 10); gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE); @@ -3819,38 +3796,34 @@ gtk_widget_show_all(window); - while (fgets (buf, BUF_LONG, fp)) { - if (strlen (buf) >= 5 && (!strncmp (buf+strlen(buf)-5, "<BR>\n", 5))) + while (fgets(buf, BUF_LONG, fp)) { + if (strlen(buf) >= 5 && (!strncmp(buf + strlen(buf) - 5, "<BR>\n", 5))) /* take off the \n */ - buf[strlen(buf)-1] = '\0'; - if (!name || (strlen (buf) >= 21 && strstr (buf, "---- New C"))) { - gtk_imhtml_append_text (GTK_IMHTML(layout), string->str, options); - g_string_free (string, TRUE); - string = g_string_new (buf); + buf[strlen(buf) - 1] = '\0'; + if (!name ||(strlen(buf) >= 21 && strstr(buf, "---- New C"))) { + gtk_imhtml_append_text(GTK_IMHTML(layout), string->str, options); + g_string_free(string, TRUE); + string = g_string_new(buf); } else { - string = g_string_append (string, buf); + string = g_string_append(string, buf); } while (gtk_events_pending()) gtk_main_iteration(); } - gtk_imhtml_append_text (GTK_IMHTML(layout), string->str, options); - gtk_imhtml_append_text (GTK_IMHTML(layout), "<BR>", options); + gtk_imhtml_append_text(GTK_IMHTML(layout), string->str, options); + gtk_imhtml_append_text(GTK_IMHTML(layout), "<BR>", options); gtk_signal_disconnect(GTK_OBJECT(window), block); - gtk_signal_connect(GTK_OBJECT(window), "delete_event", - GTK_SIGNAL_FUNC(destroy_dialog), window); - gtk_signal_connect(GTK_OBJECT(close_button), "clicked", - GTK_SIGNAL_FUNC(destroy_dialog), window); - gtk_signal_connect(GTK_OBJECT(clear_button), "clicked", - GTK_SIGNAL_FUNC(show_clear_log), name); - gtk_signal_connect(GTK_OBJECT(save_button), "clicked", - GTK_SIGNAL_FUNC(show_save_log), name); + gtk_signal_connect(GTK_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(destroy_dialog), window); + gtk_signal_connect(GTK_OBJECT(close_button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), window); + gtk_signal_connect(GTK_OBJECT(clear_button), "clicked", GTK_SIGNAL_FUNC(show_clear_log), name); + gtk_signal_connect(GTK_OBJECT(save_button), "clicked", GTK_SIGNAL_FUNC(show_save_log), name); gtk_widget_set_sensitive(close_button, TRUE); gtk_widget_set_sensitive(clear_button, TRUE); gtk_widget_set_sensitive(save_button, TRUE); fclose(fp); - g_string_free (string, TRUE); + g_string_free(string, TRUE); return; } @@ -3902,11 +3875,9 @@ if (!rename_dialog) { rename_dialog = gtk_window_new(GTK_WINDOW_DIALOG); - gtk_window_set_wmclass(GTK_WINDOW(rename_dialog), "rename_dialog", - "Gaim"); + gtk_window_set_wmclass(GTK_WINDOW(rename_dialog), "rename_dialog", "Gaim"); gtk_window_set_policy(GTK_WINDOW(rename_dialog), FALSE, TRUE, TRUE); - gtk_window_set_title(GTK_WINDOW(rename_dialog), - _("Gaim - Rename Group")); + gtk_window_set_title(GTK_WINDOW(rename_dialog), _("Gaim - Rename Group")); gtk_signal_connect(GTK_OBJECT(rename_dialog), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), rename_dialog); gtk_widget_realize(rename_dialog); @@ -3968,7 +3939,7 @@ char *prevname = g_strdup(b->name); serv_remove_buddy(b->gc, b->name); if (!strcmp(b->name, b->show)) - g_snprintf(b->show, sizeof(b->show), "%s", new_name); + g_snprintf(b->show, sizeof(b->show), "%s", new_name); g_snprintf(b->name, sizeof(b->name), "%s", new_name); serv_add_buddy(b->gc, b->name); handle_buddy_rename(b, prevname); @@ -3990,11 +3961,9 @@ if (!rename_bud_dialog) { rename_bud_dialog = gtk_window_new(GTK_WINDOW_DIALOG); - gtk_window_set_wmclass(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog", - "Gaim"); + gtk_window_set_wmclass(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog", "Gaim"); gtk_window_set_policy(GTK_WINDOW(rename_bud_dialog), FALSE, TRUE, TRUE); - gtk_window_set_title(GTK_WINDOW(rename_bud_dialog), - _("Gaim - Rename Buddy")); + gtk_window_set_title(GTK_WINDOW(rename_bud_dialog), _("Gaim - Rename Buddy")); gtk_signal_connect(GTK_OBJECT(rename_bud_dialog), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), rename_bud_dialog); gtk_widget_realize(rename_bud_dialog); @@ -4040,32 +4009,35 @@ gtk_widget_show_all(rename_bud_dialog); } -static GtkWidget *perl_config = NULL; +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); +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) { +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); @@ -4096,15 +4068,14 @@ } 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);
--- a/src/gaimrc.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/gaimrc.c Thu Sep 27 19:17:11 2001 +0000 @@ -219,8 +219,7 @@ /* auto { time } { default message } */ else if (!strcmp(p->option, "auto")) { auto_away = atoi(p->value[0]); - default_away = g_slist_nth_data(away_messages, - atoi(p->value[1])); + default_away = g_slist_nth_data(away_messages, atoi(p->value[1])); } } } @@ -249,7 +248,7 @@ awy = g_slist_next(awy); } - fprintf(f, "\tauto { %d } { %d }\n", auto_away, + fprintf(f, "\tauto { %d } { %d }\n", auto_away, g_slist_index(away_messages, default_away)); } else { fprintf(f, "\tmessage { boring default } { %s }\n", BORING_DEFAULT_AWAY_MSG); @@ -293,7 +292,7 @@ g_snprintf(b->sound, sizeof(b->sound), "%s", p->value[6]); filter_break(b->sound); - + buddy_pounces = g_list_append(buddy_pounces, b); } } @@ -448,7 +447,7 @@ } if ((i = strlen(u->user_info))) { - u->user_info[i-1] = '\0'; + u->user_info[i - 1] = '\0'; } if (!fgets(buf, sizeof(buf), f)) {
--- a/src/html.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/html.c Thu Sep 27 19:17:11 2001 +0000 @@ -196,7 +196,7 @@ gunk->website = parse_url(url); if ((sock = proxy_connect(gunk->website.address, gunk->website.port, - grab_url_callback, gunk)) < 0) { + grab_url_callback, gunk)) < 0) { g_free(gunk->url); g_free(gunk); callback(data, g_strdup(_("g003: Error opening connection.\n")));
--- a/src/idle.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/idle.c Thu Sep 27 19:17:11 2001 +0000 @@ -69,8 +69,7 @@ #endif /* USE_SCREENSAVER */ idle_time = t - gc->lastsent; - if ((away_options & OPT_AWAY_AUTO) && (idle_time > (60 * auto_away)) && - (!gc->is_auto_away)) { + if ((away_options & OPT_AWAY_AUTO) && (idle_time > (60 * auto_away)) && (!gc->is_auto_away)) { if (!gc->away) { debug_printf("making %s away automatically\n", gc->username); if (g_slist_length(connections) == 1)
--- a/src/multi.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/multi.c Thu Sep 27 19:17:11 2001 +0000 @@ -47,8 +47,9 @@ static GtkWidget *newmod = NULL; /* the dialog for creating a new account */ static GtkWidget *newmain = NULL; /* the notebook that holds options */ static struct aim_user tmpusr = { "", "", "", OPT_USR_REM_PASS, DEFAULT_PROTO, - { "", "", "", "", "", "", "" }, "", NULL, NULL, NULL, NULL, NULL, - NULL, NULL, OPT_USR_REM_PASS, DEFAULT_PROTO, NULL, NULL, NULL }; + {"", "", "", "", "", "", ""}, "", NULL, NULL, NULL, NULL, NULL, + NULL, NULL, OPT_USR_REM_PASS, DEFAULT_PROTO, NULL, NULL, NULL +}; static void generate_prpl_options(struct aim_user *, GtkWidget *); @@ -267,7 +268,7 @@ GtkEntry *entry = tmp->data; int pos = (int)gtk_object_get_user_data(GTK_OBJECT(entry)); g_snprintf(u->proto_opt[pos], sizeof(u->proto_opt[pos]), "%s", - gtk_entry_get_text(entry)); + gtk_entry_get_text(entry)); tmp = tmp->next; } if (u->opt_entries) @@ -287,7 +288,7 @@ GtkEntry *entry = tmp->data; int pos = (int)gtk_object_get_user_data(GTK_OBJECT(entry)); g_snprintf(u->proto_opt[pos], sizeof(u->proto_opt[pos]), "%s", - gtk_entry_get_text(entry)); + gtk_entry_get_text(entry)); tmp = tmp->next; } if (tmpusr.opt_entries) @@ -324,20 +325,16 @@ for (i = 0; i < 7; i++) u->proto_opt[i][0] = '\0'; p = find_prpl(u->tmp_protocol); - if (!(p->options & OPT_PROTO_NO_PASSWORD) && - (q->options & OPT_PROTO_NO_PASSWORD)) { + if (!(p->options & OPT_PROTO_NO_PASSWORD) && (q->options & OPT_PROTO_NO_PASSWORD)) { gtk_widget_hide(u->pwdbox); gtk_widget_hide(u->rempass); - } else if ((p->options & OPT_PROTO_NO_PASSWORD) && - !(q->options & OPT_PROTO_NO_PASSWORD)) { + } else if ((p->options & OPT_PROTO_NO_PASSWORD) && !(q->options & OPT_PROTO_NO_PASSWORD)) { gtk_widget_show(u->pwdbox); gtk_widget_show(u->rempass); } - if (!(p->options & OPT_PROTO_MAIL_CHECK) && - (q->options & OPT_PROTO_MAIL_CHECK)) { + if (!(p->options & OPT_PROTO_MAIL_CHECK) && (q->options & OPT_PROTO_MAIL_CHECK)) { gtk_widget_show(u->checkmail); - } else if ((p->options & OPT_PROTO_MAIL_CHECK) && - !(q->options & OPT_PROTO_MAIL_CHECK)) { + } else if ((p->options & OPT_PROTO_MAIL_CHECK) && !(q->options & OPT_PROTO_MAIL_CHECK)) { gtk_widget_hide(u->checkmail); } u->tmp_protocol = proto; @@ -347,20 +344,16 @@ for (i = 0; i < 7; i++) tmpusr.proto_opt[i][0] = '\0'; p = find_prpl(tmpusr.tmp_protocol); - if (!(p->options & OPT_PROTO_NO_PASSWORD) && - (q->options & OPT_PROTO_NO_PASSWORD)) { + if (!(p->options & OPT_PROTO_NO_PASSWORD) && (q->options & OPT_PROTO_NO_PASSWORD)) { gtk_widget_hide(tmpusr.pwdbox); gtk_widget_hide(tmpusr.rempass); - } else if ((p->options & OPT_PROTO_NO_PASSWORD) && - !(q->options & OPT_PROTO_NO_PASSWORD)) { + } else if ((p->options & OPT_PROTO_NO_PASSWORD) && !(q->options & OPT_PROTO_NO_PASSWORD)) { gtk_widget_show(tmpusr.pwdbox); gtk_widget_show(tmpusr.rempass); } - if (!(p->options & OPT_PROTO_MAIL_CHECK) && - (q->options & OPT_PROTO_MAIL_CHECK)) { + if (!(p->options & OPT_PROTO_MAIL_CHECK) && (q->options & OPT_PROTO_MAIL_CHECK)) { gtk_widget_show(tmpusr.checkmail); - } else if ((p->options & OPT_PROTO_MAIL_CHECK) && - !(q->options & OPT_PROTO_MAIL_CHECK)) { + } else if ((p->options & OPT_PROTO_MAIL_CHECK) && !(q->options & OPT_PROTO_MAIL_CHECK)) { gtk_widget_hide(tmpusr.checkmail); } tmpusr.tmp_protocol = tmpusr.protocol = proto; @@ -460,7 +453,7 @@ rempass = acct_button(_("Remember Password"), u, OPT_USR_REM_PASS, vbox); acct_button(_("Auto-Login"), u, OPT_USR_AUTO, vbox); - /*acct_button(_("Send KeepAlive packet (6 bytes/second)"), u, OPT_USR_KEEPALV, vbox);*/ + /*acct_button(_("Send KeepAlive packet (6 bytes/second)"), u, OPT_USR_KEEPALV, vbox); */ checkmail = acct_button(_("New Mail Notifications"), u, OPT_USR_MAIL_CHECK, vbox); gtk_widget_show_all(vbox); @@ -638,7 +631,7 @@ } gtk_widget_show_all(mod); - + if (u) { p = find_prpl(u->tmp_protocol); if (p && (p->options & OPT_PROTO_NO_PASSWORD)) { @@ -823,7 +816,7 @@ { GList *l = aim_users; struct aim_user *u; - int i = 0; /* faster than doing g_list_index each time */ + int i = 0; /* faster than doing g_list_index each time */ while (l) { u = l->data; l = l->next; @@ -962,7 +955,7 @@ serv_set_away(gc, GAIM_AWAY_CUSTOM, awaymessage->message); } if (opt_away_arg != NULL) { - g_free (opt_away_arg); + g_free(opt_away_arg); opt_away_arg = NULL; }
--- a/src/plugins.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/plugins.c Thu Sep 27 19:17:11 2001 +0000 @@ -227,10 +227,11 @@ plugins = g_list_append(plugins, plug); - if (g_module_symbol(plug->handle, "name", (gpointer *)&cfunc)) + if (g_module_symbol(plug->handle, "name", (gpointer *)&cfunc)) { plug->name = (*cfunc)(); - else + } else { plug->name = NULL; + } if (g_module_symbol(plug->handle, "description", (gpointer *)&cfunc)) plug->description = (*cfunc)();
--- a/src/prefs.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/prefs.c Thu Sep 27 19:17:11 2001 +0000 @@ -215,8 +215,7 @@ gtk_container_add(GTK_CONTAINER(frame), mbox); gtk_widget_show(mbox); - gaim_button(_("Use borderless buttons"), &misc_options, - OPT_MISC_COOL_LOOK, mbox); + gaim_button(_("Use borderless buttons"), &misc_options, OPT_MISC_COOL_LOOK, mbox); if (!tickerwindow && (misc_options & OPT_MISC_BUDDY_TICKER)) misc_options ^= OPT_MISC_BUDDY_TICKER; @@ -257,11 +256,15 @@ gtk_box_pack_start(GTK_BOX(mbox), sep, FALSE, FALSE, 0); gtk_widget_show(sep); - gaim_button(_("Log when buddies sign on/sign off"), &logging_options, OPT_LOG_BUDDY_SIGNON, mbox); - gaim_button(_("Log when buddies become idle/un-idle"), &logging_options, OPT_LOG_BUDDY_IDLE, mbox); + gaim_button(_("Log when buddies sign on/sign off"), &logging_options, OPT_LOG_BUDDY_SIGNON, + mbox); + gaim_button(_("Log when buddies become idle/un-idle"), &logging_options, OPT_LOG_BUDDY_IDLE, + mbox); gaim_button(_("Log when buddies go away/come back"), &logging_options, OPT_LOG_BUDDY_AWAY, mbox); - gaim_button(_("Log your own signons/idleness/awayness"), &logging_options, OPT_LOG_MY_SIGNON, mbox); - gaim_button(_("Individual log file for each buddy's signons"), &logging_options, OPT_LOG_INDIVIDUAL, mbox); + gaim_button(_("Log your own signons/idleness/awayness"), &logging_options, OPT_LOG_MY_SIGNON, + mbox); + gaim_button(_("Individual log file for each buddy's signons"), &logging_options, + OPT_LOG_INDIVIDUAL, mbox); frame = gtk_frame_new(_("Browser")); gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5); @@ -321,7 +324,7 @@ static void proxy_print_option(GtkEntry *entry, int entrynum) { - if (entrynum == PROXYHOST) + if (entrynum == PROXYHOST) g_snprintf(proxyhost, sizeof(proxyhost), "%s", gtk_entry_get_text(entry)); else if (entrynum == PROXYPORT) proxyport = atoi(gtk_entry_get_text(entry)); @@ -332,11 +335,11 @@ save_prefs(); } -static void proxy_print_optionrad(GtkRadioButton *entry, int entrynum) +static void proxy_print_optionrad(GtkRadioButton * entry, int entrynum) { if (entrynum == PROXY_NONE) gtk_widget_set_sensitive(GTK_WIDGET(prefs_proxy_frame), FALSE); - else + else gtk_widget_set_sensitive(GTK_WIDGET(prefs_proxy_frame), TRUE); proxytype = entrynum; @@ -378,7 +381,7 @@ gtk_container_set_border_width(GTK_CONTAINER(frame), 5); gtk_widget_show(frame); gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5); - + table = gtk_table_new(2, 2, FALSE); gtk_container_set_border_width(GTK_CONTAINER(table), 5); gtk_table_set_col_spacings(GTK_TABLE(table), 5); @@ -390,33 +393,37 @@ gtk_table_attach(GTK_TABLE(table), first, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(first), "clicked", - GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_NONE); + GTK_SIGNAL_FUNC(proxy_print_optionrad), (void *)PROXY_NONE); gtk_widget_show(first); - + if (proxytype == PROXY_NONE) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(first), TRUE); - opt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), _("SOCKS 4")); + opt = + gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), + _("SOCKS 4")); gtk_table_attach(GTK_TABLE(table), opt, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(opt), "clicked", - GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_SOCKS4); + GTK_SIGNAL_FUNC(proxy_print_optionrad), (void *)PROXY_SOCKS4); gtk_widget_show(opt); if (proxytype == PROXY_SOCKS4) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); opt = - gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), _("SOCKS 5")); + gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), + _("SOCKS 5")); gtk_table_attach(GTK_TABLE(table), opt, 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(opt), "clicked", - GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_SOCKS5); + GTK_SIGNAL_FUNC(proxy_print_optionrad), (void *)PROXY_SOCKS5); gtk_widget_show(opt); if (proxytype == PROXY_SOCKS5) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); - opt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), _("HTTP")); + opt = + gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(first)), _("HTTP")); gtk_table_attach(GTK_TABLE(table), opt, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(opt), "clicked", - GTK_SIGNAL_FUNC(proxy_print_optionrad), (void*)PROXY_HTTP); + GTK_SIGNAL_FUNC(proxy_print_optionrad), (void *)PROXY_HTTP); gtk_widget_show(opt); if (proxytype == PROXY_HTTP) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); @@ -428,7 +435,7 @@ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5); prefs_proxy_frame = frame; - + if (proxytype == PROXY_NONE) gtk_widget_set_sensitive(GTK_WIDGET(frame), FALSE); @@ -448,7 +455,7 @@ entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(entry), "changed", - GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYHOST); + GTK_SIGNAL_FUNC(proxy_print_option), (void *)PROXYHOST); gtk_entry_set_text(GTK_ENTRY(entry), proxyhost); gtk_widget_show(entry); @@ -464,7 +471,7 @@ entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(entry), "changed", - GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYPORT); + GTK_SIGNAL_FUNC(proxy_print_option), (void *)PROXYPORT); if (proxyport) { char buf[128]; @@ -481,7 +488,7 @@ entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(entry), "changed", - GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYUSER); + GTK_SIGNAL_FUNC(proxy_print_option), (void *)PROXYUSER); gtk_entry_set_text(GTK_ENTRY(entry), proxyuser); gtk_widget_show(entry); @@ -498,7 +505,7 @@ gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); gtk_signal_connect(GTK_OBJECT(entry), "changed", - GTK_SIGNAL_FUNC(proxy_print_option), (void*)PROXYPASS); + GTK_SIGNAL_FUNC(proxy_print_option), (void *)PROXYPASS); gtk_entry_set_text(GTK_ENTRY(entry), proxypass); gtk_widget_show(entry); @@ -554,7 +561,8 @@ gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5); gtk_widget_show(vbox); - button2 = gaim_button(_("Show pictures on buttons"), &blist_options, OPT_BLIST_SHOW_BUTTON_XPM, vbox); + button2 = + gaim_button(_("Show pictures on buttons"), &blist_options, OPT_BLIST_SHOW_BUTTON_XPM, vbox); if (blist_options & OPT_BLIST_NO_BUTTONS) gtk_widget_set_sensitive(button2, FALSE); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), button2); @@ -720,12 +728,12 @@ gtk_widget_show(opt); if (which & 1) { if (which == (OPT_CHAT_BUTTON_TEXT | 1)) { - if ( (chat_options & OPT_CHAT_BUTTON_TEXT) && + if ((chat_options & OPT_CHAT_BUTTON_TEXT) && !(chat_options & OPT_CHAT_BUTTON_XPM)) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); } else if (which == (OPT_CHAT_BUTTON_XPM | 1)) { if (!(chat_options & OPT_CHAT_BUTTON_TEXT) && - (chat_options & OPT_CHAT_BUTTON_XPM)) + (chat_options & OPT_CHAT_BUTTON_XPM)) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); } else { if (((chat_options & OPT_CHAT_BUTTON_TEXT) && @@ -736,18 +744,15 @@ } } else { if (which == OPT_IM_BUTTON_TEXT) { - if ( (im_options & OPT_IM_BUTTON_TEXT) && - !(im_options & OPT_IM_BUTTON_XPM)) + if ((im_options & OPT_IM_BUTTON_TEXT) && !(im_options & OPT_IM_BUTTON_XPM)) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); } else if (which == OPT_IM_BUTTON_XPM) { - if (!(im_options & OPT_IM_BUTTON_TEXT) && - (im_options & OPT_IM_BUTTON_XPM)) + if (!(im_options & OPT_IM_BUTTON_TEXT) && (im_options & OPT_IM_BUTTON_XPM)) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); } else { if (((im_options & OPT_IM_BUTTON_TEXT) && (im_options & OPT_IM_BUTTON_XPM)) || - (!(im_options & OPT_IM_BUTTON_TEXT) && - !(im_options & OPT_IM_BUTTON_XPM))) + (!(im_options & OPT_IM_BUTTON_TEXT) && !(im_options & OPT_IM_BUTTON_XPM))) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); } } @@ -758,7 +763,7 @@ static void set_tab_opt(GtkWidget *w, int data) { int mask; - if (data & 0x1) { /* set the first bit if we're affecting chat buttons */ + if (data & 0x1) { /* set the first bit if we're affecting chat buttons */ mask = (OPT_CHAT_SIDE_TAB | OPT_CHAT_BR_TAB); chat_options &= ~(mask); chat_options |= (data & mask); @@ -828,7 +833,7 @@ gtk_widget_set_usize(spin, 50, -1); gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(adjust), "value-changed", - GTK_SIGNAL_FUNC(update_spin_value), GTK_WIDGET(spin)); + GTK_SIGNAL_FUNC(update_spin_value), GTK_WIDGET(spin)); gtk_widget_show(spin); } @@ -894,7 +899,9 @@ gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 5); gtk_widget_show(vbox2); - button = gaim_button(_("Show all conversations in one tabbed window"), &im_options, OPT_IM_ONE_WINDOW, vbox2); + button = + gaim_button(_("Show all conversations in one tabbed window"), &im_options, OPT_IM_ONE_WINDOW, + vbox2); gaim_button(_("Raise windows on events"), &im_options, OPT_IM_POPUP, vbox2); gaim_button(_("Show logins in window"), &im_options, OPT_IM_LOGON, vbox2); @@ -1013,7 +1020,9 @@ gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 5); gtk_widget_show(label); - opt = am_radio(_("Pictures And Text"), OPT_CHAT_BUTTON_TEXT | OPT_CHAT_BUTTON_XPM | 1, vbox2, NULL); + opt = + am_radio(_("Pictures And Text"), OPT_CHAT_BUTTON_TEXT | OPT_CHAT_BUTTON_XPM | 1, vbox2, + NULL); opt = am_radio(_("Pictures"), OPT_CHAT_BUTTON_XPM | 1, vbox2, opt); opt = am_radio(_("Text"), OPT_CHAT_BUTTON_TEXT | 1, vbox2, opt); @@ -1025,7 +1034,9 @@ gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 5); gtk_widget_show(vbox2); - button = gaim_button(_("Show all chats in one tabbed window"), &chat_options, OPT_CHAT_ONE_WINDOW, vbox2); + button = + gaim_button(_("Show all chats in one tabbed window"), &chat_options, OPT_CHAT_ONE_WINDOW, + vbox2); gaim_button(_("Raise windows on events"), &chat_options, OPT_CHAT_POPUP, vbox2); gaim_button(_("Show people joining/leaving in window"), &chat_options, OPT_CHAT_LOGON, vbox2); @@ -1196,25 +1207,25 @@ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (font_options & OPT_FONT_BOLD)); gtk_table_attach(GTK_TABLE(table), button, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(set_font_option), (int*)OPT_FONT_BOLD); + GTK_SIGNAL_FUNC(set_font_option), (int *)OPT_FONT_BOLD); button = gtk_check_button_new_with_label(_("Italic Text")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (font_options & OPT_FONT_ITALIC)); gtk_table_attach(GTK_TABLE(table), button, 0, 1, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(set_font_option), (int*)OPT_FONT_ITALIC); + GTK_SIGNAL_FUNC(set_font_option), (int *)OPT_FONT_ITALIC); button = gtk_check_button_new_with_label(_("Underline Text")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (font_options & OPT_FONT_UNDERLINE)); gtk_table_attach(GTK_TABLE(table), button, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(set_font_option), (int*)OPT_FONT_UNDERLINE); + GTK_SIGNAL_FUNC(set_font_option), (int *)OPT_FONT_UNDERLINE); button = gtk_check_button_new_with_label(_("Strike through Text")); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (font_options & OPT_FONT_STRIKE)); gtk_table_attach(GTK_TABLE(table), button, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(set_font_option), (int*)OPT_FONT_STRIKE); + GTK_SIGNAL_FUNC(set_font_option), (int *)OPT_FONT_STRIKE); gtk_widget_show_all(table); @@ -1234,7 +1245,7 @@ gtk_widget_show(frame); gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5); - + hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(fbox), hbox, FALSE, FALSE, 5); gtk_widget_show(hbox); @@ -1279,7 +1290,7 @@ hbox = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(fbox), hbox, FALSE, FALSE, 5); gtk_widget_show(hbox); - + button = gaim_button(_("Font Face for Text"), &font_options, OPT_FONT_FACE, hbox); select = picture_button(prefs, _("Select"), fontface2_xpm); @@ -1305,8 +1316,8 @@ gtk_widget_set_sensitive(GTK_WIDGET(spin), FALSE); gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), spin); -+ gtk_signal_connect(GTK_OBJECT(adjust), "value-changed", GTK_SIGNAL_FUNC(update_spin_value), - GTK_WIDGET(spin)); + +gtk_signal_connect(GTK_OBJECT(adjust), "value-changed", GTK_SIGNAL_FUNC(update_spin_value), + GTK_WIDGET(spin)); gtk_widget_show(spin); gtk_container_add(GTK_CONTAINER(frame), fbox); @@ -1435,7 +1446,7 @@ gtk_widget_show(entry); } -static gint sound_cmd_yeah(GtkEntry * entry, GdkEvent *event, gpointer d) +static gint sound_cmd_yeah(GtkEntry *entry, GdkEvent *event, gpointer d) { g_snprintf(sound_cmd, sizeof(sound_cmd), "%s", gtk_entry_get_text(GTK_ENTRY(sndcmd))); save_prefs(); @@ -1527,7 +1538,8 @@ gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 5); gtk_widget_show(sep); - sound_entry(_("Sound when received message begins conversation"), OPT_SOUND_FIRST_RCV, vbox, FIRST_RECEIVE); + sound_entry(_("Sound when received message begins conversation"), OPT_SOUND_FIRST_RCV, vbox, + FIRST_RECEIVE); sound_entry(_("Sound when message is received"), OPT_SOUND_RECV, vbox, RECEIVE); sound_entry(_("Sound when message is sent"), OPT_SOUND_SEND, vbox, SEND); @@ -1561,11 +1573,9 @@ strcpy(buffer, a->message); tmp = stylize(buffer, BUF_LONG); gtk_imhtml_append_text(GTK_IMHTML(away_text), tmp, GTK_IMHTML_NO_TITLE | - GTK_IMHTML_NO_COMMENTS | - GTK_IMHTML_NO_SCROLL); + GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL); gtk_imhtml_append_text(GTK_IMHTML(away_text), "<BR>", GTK_IMHTML_NO_TITLE | - GTK_IMHTML_NO_COMMENTS | - GTK_IMHTML_NO_SCROLL); + GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL); g_free(tmp); } @@ -1693,7 +1703,8 @@ gaim_button(_("Ignore new conversations when away"), &away_options, OPT_AWAY_DISCARD, vbox2); gaim_button(_("Sounds while away"), &sound_options, OPT_SOUND_WHEN_AWAY, vbox2); - gaim_button(_("Sending messages removes away status"), &away_options, OPT_AWAY_BACK_ON_IM, vbox2); + gaim_button(_("Sending messages removes away status"), &away_options, OPT_AWAY_BACK_ON_IM, + vbox2); vbox2 = gtk_vbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 5); @@ -1813,11 +1824,9 @@ g_snprintf(buffer, sizeof(buffer), "%s", a->message); tmp = stylize(buffer, BUF_LONG); gtk_imhtml_append_text(GTK_IMHTML(away_text), tmp, GTK_IMHTML_NO_TITLE | - GTK_IMHTML_NO_COMMENTS | - GTK_IMHTML_NO_SCROLL); + GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL); gtk_imhtml_append_text(GTK_IMHTML(away_text), "<BR>", GTK_IMHTML_NO_TITLE | - GTK_IMHTML_NO_COMMENTS | - GTK_IMHTML_NO_SCROLL); + GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_SCROLL); g_free(tmp); } @@ -1825,7 +1834,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); @@ -2176,8 +2186,8 @@ gtk_widget_show(prefdialog); } -void update_connection_dependent_prefs() /* what a crappy name */ -{ +void update_connection_dependent_prefs() +{ /* what a crappy name */ gboolean needdeny = FALSE; GSList *c = connections; struct gaim_connection *gc = NULL; @@ -2215,7 +2225,7 @@ } } -static void try_me(GtkCTree * ctree, GtkCTreeNode * node) +static void try_me(GtkCTree *ctree, GtkCTreeNode *node) { /* this is a hack */ void (*func)(); @@ -2376,7 +2386,6 @@ if (scroll) gtk_adjustment_set_value(adj, adj->upper - adj->lower - adj->page_size); } - #ifdef DEBUG g_print("%s", s); #endif
--- a/src/proxy.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/proxy.c Thu Sep 27 19:17:11 2001 +0000 @@ -43,8 +43,8 @@ #define GAIM_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL) char proxyhost[128] = { 0 }; -int proxyport = 0; -int proxytype = 0; +int proxyport = 0; +int proxytype = 0; char proxyuser[128] = { 0 }; char proxypass[128] = { 0 }; @@ -78,15 +78,14 @@ gaim_cond |= GAIM_INPUT_WRITE; debug_printf("CLOSURE: callback for %d, fd is %d\n", - closure->result, g_io_channel_unix_get_fd(source)); + closure->result, g_io_channel_unix_get_fd(source)); closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond); return TRUE; } -gint gaim_input_add(gint source, GaimInputCondition condition, - GaimInputFunction function, gpointer data) +gint gaim_input_add(gint source, GaimInputCondition condition, GaimInputFunction function, gpointer data) { GaimIOClosure *closure = g_new0(GaimIOClosure, 1); GIOChannel *channel; @@ -102,7 +101,7 @@ channel = g_io_channel_unix_new(source); closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond, - gaim_io_invoke, closure, gaim_io_destroy); + gaim_io_invoke, closure, gaim_io_destroy); debug_printf("CLOSURE: adding input watcher %d for fd %d\n", closure->result, source); @@ -191,10 +190,10 @@ return -1; } fcntl(fd, F_SETFL, 0); - phb->port = fd; /* bleh */ - g_timeout_add(50, clean_connect, phb); /* we do this because we never - want to call our callback - before we return. */ + phb->port = fd; /* bleh */ + g_timeout_add(50, clean_connect, phb); /* we do this because we never + want to call our callback + before we return. */ } return fd; @@ -213,16 +212,16 @@ gaim_input_remove(phb->inpa); while ((nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) { - if (inputline[pos-1] == '\n') + if (inputline[pos - 1] == '\n') nlc++; - else if (inputline[pos-1] != '\r') + else if (inputline[pos - 1] != '\r') nlc = 0; } inputline[pos] = '\0'; debug_printf("Proxy says: %s\n", inputline); - if ((memcmp(HTTP_GOODSTRING , inputline, strlen(HTTP_GOODSTRING )) == 0) || + if ((memcmp(HTTP_GOODSTRING, inputline, strlen(HTTP_GOODSTRING)) == 0) || (memcmp(HTTP_GOODSTRING2, inputline, strlen(HTTP_GOODSTRING2)) == 0)) { phb->func(phb->data, source, GAIM_INPUT_READ); g_free(phb->host); @@ -256,7 +255,8 @@ } fcntl(source, F_SETFL, 0); - g_snprintf(cmd, sizeof(cmd), "CONNECT %s:%d HTTP/1.1\r\nHost = %s:%d\r\n", phb->host, phb->port, phb->host, phb->port); + g_snprintf(cmd, sizeof(cmd), "CONNECT %s:%d HTTP/1.1\r\nHost = %s:%d\r\n", phb->host, phb->port, + phb->host, phb->port); if (send(source, cmd, strlen(cmd), 0) < 0) { close(source); phb->func(phb->data, -1, GAIM_INPUT_READ); @@ -583,12 +583,12 @@ if (buf[1] == 0x02) { unsigned int i = strlen(proxyuser), j = strlen(proxypass); - buf[0] = 0x01; /* version 1 */ + buf[0] = 0x01; /* version 1 */ buf[1] = i; - memcpy(buf+2, proxyuser, i); - buf[2+i] = j; - memcpy(buf+2+i+1, proxypass, j); - if (write(source, buf, 3+i+j) < 3+i+j) { + memcpy(buf + 2, proxyuser, i); + buf[2 + i] = j; + memcpy(buf + 2 + i + 1, proxypass, j); + if (write(source, buf, 3 + i + j) < 3 + i + j) { close(source); phb->func(phb->data, -1, GAIM_INPUT_READ); g_free(phb->host); @@ -715,9 +715,7 @@ sethostent(1); - if ((proxytype == PROXY_NONE) || - !proxyhost || !proxyhost[0] || - !proxyport || (proxyport == -1)) + if ((proxytype == PROXY_NONE) || !proxyhost || !proxyhost[0] || !proxyport || (proxyport == -1)) return proxy_connect_none(host, port, phb); else if (proxytype == PROXY_HTTP) return proxy_connect_http(host, port, phb);
--- a/src/prpl.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/prpl.c Thu Sep 27 19:17:11 2001 +0000 @@ -66,10 +66,10 @@ struct prpl *old; if (size != sizeof(struct prpl)) { do_error_dialog(_("You have attempted to load a protocol which was not compiled" - " from the same version of the source as this application was." - " Unfortunately, because it is not the same version I cannot" - " safely tell you which one it was. Needless to say, it was not" - " successfully loaded."), _("Protocol Error")); + " from the same version of the source as this application was." + " Unfortunately, because it is not the same version I cannot" + " safely tell you which one it was. Needless to say, it was not" + " successfully loaded."), _("Protocol Error")); return; } p = g_new0(struct prpl, 1); @@ -341,7 +341,8 @@ } } -static void des_email_win(GtkWidget *w, struct gaim_connection *yd) { +static void des_email_win(GtkWidget *w, struct gaim_connection *yd) +{ gtk_widget_destroy(yd->email_win); if (yd->email_win == w) yd->email_win = NULL; @@ -356,8 +357,7 @@ return; if (count < 0 && from && subject) { - g_snprintf(buf, sizeof buf, "%s has mail from %s: %s", - gc->username, from, subject); + g_snprintf(buf, sizeof buf, "%s has mail from %s: %s", gc->username, from, subject); if (!gc->email_win) { GtkWidget *close; @@ -372,13 +372,13 @@ gc->email_label = gtk_label_new(buf); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(gc->email_win)->vbox), - gc->email_label, 0, 0, 5); + gc->email_label, 0, 0, 5); gtk_widget_show(gc->email_label); close = picture_button(gc->email_win, _("Close"), cancel_xpm); gtk_window_set_focus(GTK_WINDOW(gc->email_win), close); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(gc->email_win)->action_area), - close, 0, 0, 5); + close, 0, 0, 5); gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(des_email_win), gc); @@ -387,7 +387,7 @@ gtk_label_set_text(GTK_LABEL(gc->email_label), buf); } else if (count) { g_snprintf(buf, sizeof buf, "%s has %d new message%s.", - gc->username, count, count == 1 ? "" : "s"); + gc->username, count, count == 1 ? "" : "s"); if (!gc->email_win) { GtkWidget *close; @@ -402,13 +402,13 @@ gc->email_label = gtk_label_new(buf); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(gc->email_win)->vbox), - gc->email_label, 0, 0, 5); + gc->email_label, 0, 0, 5); gtk_widget_show(gc->email_label); close = picture_button(gc->email_win, _("Close"), cancel_xpm); gtk_window_set_focus(GTK_WINDOW(gc->email_win), close); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(gc->email_win)->action_area), - close, 0, 0, 5); + close, 0, 0, 5); gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(des_email_win), gc);
--- a/src/server.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/server.c Thu Sep 27 19:17:11 2001 +0000 @@ -162,20 +162,20 @@ void serv_set_away(struct gaim_connection *gc, char *state, char *message) { if (gc && gc->prpl && gc->prpl->set_away) { - char *buf=NULL; - if(message) { - buf = g_malloc(strlen(message)+1); - if(gc->prpl->options & OPT_PROTO_HTML) - strncpy(buf, message, strlen(message)+1); + char *buf = NULL; + if (message) { + buf = g_malloc(strlen(message) + 1); + if (gc->prpl->options & OPT_PROTO_HTML) + strncpy(buf, message, strlen(message) + 1); else - strncpy_nohtml(buf, message, strlen(message)+1); + strncpy_nohtml(buf, message, strlen(message) + 1); } (*gc->prpl->set_away)(gc, state, buf); plugin_event(event_away, gc, state, buf, 0); - if(buf) + if (buf) g_free(buf); } @@ -237,7 +237,7 @@ void serv_remove_buddies(struct gaim_connection *gc, GList *g) { if (!gc->prpl) - return; /* how the hell did that happen? */ + return; /* how the hell did that happen? */ if (gc->prpl->remove_buddies) (*gc->prpl->remove_buddies)(gc, g); else { @@ -344,8 +344,7 @@ templist = message_queue; - for (i = 0; i < GTK_CLIST(clistqueue)->rows; i++) - { + for (i = 0; i < GTK_CLIST(clistqueue)->rows; i++) { gtk_clist_get_text(GTK_CLIST(clistqueue), i, 0, &temp); if (!strcmp(name, temp)) @@ -366,7 +365,7 @@ struct queued_message *qm = (struct queued_message *)templist->data; if ((qm->flags & WFLAG_RECV) && !strcmp(name, qm->name)) i++; - + templist = templist->next; } @@ -382,7 +381,7 @@ while (templist) { qar = (struct queued_away_response *)templist->data; - + if (!strcmp(name, qar->name)) return qar; @@ -533,7 +532,7 @@ play_sound(FIRST_RECEIVE); else if (cnv->makesound && (sound_options & OPT_SOUND_RECV)) play_sound(RECEIVE); - + write_to_conv(cnv, message, away | WFLAG_RECV, NULL, mtime); } @@ -577,7 +576,8 @@ qm->flags = WFLAG_SEND | WFLAG_AUTO; message_queue = g_slist_append(message_queue, qm); } else if (cnv != NULL) - write_to_conv(cnv, away_subs(tmpmsg, alias), WFLAG_SEND | WFLAG_AUTO, NULL, mtime); + write_to_conv(cnv, away_subs(tmpmsg, alias), WFLAG_SEND | WFLAG_AUTO, NULL, + mtime); g_free(tmpmsg); } else { /* we're not away. this is easy. if the convo window doesn't exist, create and update @@ -643,7 +643,7 @@ g_snprintf(who, 63, LOG_CONVERSATION_TITLE, name); else g_snprintf(who, 63, CONVERSATION_TITLE, name); - gtk_window_set_title(GTK_WINDOW(cv->window), who); + gtk_window_set_title(GTK_WINDOW(cv->window), who); /* was g_free(buf), but break gives us that * and freeing twice is not good --Sumner */ break; @@ -769,7 +769,7 @@ static void chat_invite_callback(GtkWidget *w, GtkWidget *w2) { struct gaim_connection *g = (struct gaim_connection *) - gtk_object_get_user_data(GTK_OBJECT(GTK_DIALOG(w2)->vbox)); + gtk_object_get_user_data(GTK_OBJECT(GTK_DIALOG(w2)->vbox)); GList *str, *tmp; str = gtk_object_get_user_data(GTK_OBJECT(w2)); @@ -907,7 +907,8 @@ delete_chat(b); } -void serv_got_chat_in(struct gaim_connection *g, int id, char *who, int whisper, char *message, time_t mtime) +void serv_got_chat_in(struct gaim_connection *g, int id, char *who, int whisper, char *message, + time_t mtime) { int w; GSList *bcs = g->buddy_chats; @@ -926,7 +927,7 @@ return; if (plugin_event(event_chat_recv, g, (void *)b->id, who, message)) - return; + return; buf = g_malloc(MAX(strlen(message) * 2, 8192)); strcpy(buf, message);
--- a/src/sound.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/sound.c Thu Sep 27 19:17:11 2001 +0000 @@ -202,7 +202,7 @@ static int play_artsc(unsigned char *data, int size) { arts_stream_t stream; - guint16* lineardata; + guint16 *lineardata; int result = 1; int error; int i; @@ -243,7 +243,7 @@ static int artsc_play_file(char *file) { struct stat stat_buf; - unsigned char* buf = NULL; + unsigned char *buf = NULL; int result = 0; int fd = -1; @@ -263,15 +263,17 @@ buf = g_malloc(stat_buf.st_size); if (!buf) goto out; - + if (read(fd, buf, stat_buf.st_size) < 0) goto out; result = play_artsc(buf, stat_buf.st_size); - out: - if (buf) g_free(buf); - if (fd != -1) close(fd); + out: + if (buf) + g_free(buf); + if (fd != -1) + close(fd); return result; }
--- a/src/util.c Thu Sep 27 17:44:23 2001 +0000 +++ b/src/util.c Thu Sep 27 19:17:11 2001 +0000 @@ -86,21 +86,18 @@ if (hrs) { if (min) { g_snprintf(ret, 256, - "%d day%s, %d hour%s, %d minute%s.", - daze, daze == 1 ? "" : "s", - hrs, hrs == 1 ? "" : "s", - min, min == 1 ? "" : "s"); + "%d day%s, %d hour%s, %d minute%s.", + daze, daze == 1 ? "" : "s", + hrs, hrs == 1 ? "" : "s", min, min == 1 ? "" : "s"); } else { g_snprintf(ret, 256, - "%d day%s, %d hour%s.", - daze, daze == 1 ? "" : "s", - hrs, hrs == 1 ? "" : "s"); + "%d day%s, %d hour%s.", + daze, daze == 1 ? "" : "s", hrs, hrs == 1 ? "" : "s"); } } else { g_snprintf(ret, 256, - "%d day%s, %d minute%s.", - daze, daze == 1 ? "" : "s", - min, min == 1 ? "" : "s"); + "%d day%s, %d minute%s.", + daze, daze == 1 ? "" : "s", min, min == 1 ? "" : "s"); } } else g_snprintf(ret, 256, "%d day%s.", daze, daze == 1 ? "" : "s"); @@ -108,9 +105,8 @@ if (hrs) { if (min) { g_snprintf(ret, 256, - "%d hour%s, %d minute%s.", - hrs, hrs == 1 ? "" : "s", - min, min == 1 ? "" : "s"); + "%d hour%s, %d minute%s.", + hrs, hrs == 1 ? "" : "s", min, min == 1 ? "" : "s"); } else { g_snprintf(ret, 256, "%d hour%s.", hrs, hrs == 1 ? "" : "s"); } @@ -440,11 +436,11 @@ if (flag) { /* is a new file */ if (logging_options & OPT_LOG_STRIP_HTML) { - fprintf(fd, "IM Sessions with %s\n", name); - }else { - fprintf(fd, "<HTML><HEAD><TITLE>"); - fprintf(fd, "IM Sessions with %s", name); - fprintf(fd, "</TITLE></HEAD><BODY BGCOLOR=\"ffffff\">\n"); + fprintf(fd, "IM Sessions with %s\n", name); + } else { + fprintf(fd, "<HTML><HEAD><TITLE>"); + fprintf(fd, "IM Sessions with %s", name); + fprintf(fd, "</TITLE></HEAD><BODY BGCOLOR=\"ffffff\">\n"); } } @@ -456,11 +452,11 @@ if (fd && flag) { /* is a new file */ if (logging_options & OPT_LOG_STRIP_HTML) { - fprintf(fd, "IM Sessions with %s\n", name); - }else { - fprintf(fd, "<HTML><HEAD><TITLE>"); - fprintf(fd, "IM Sessions with %s", name); - fprintf(fd, "</TITLE></HEAD><BODY BGCOLOR=\"ffffff\">\n"); + fprintf(fd, "IM Sessions with %s\n", name); + } else { + fprintf(fd, "<HTML><HEAD><TITLE>"); + fprintf(fd, "IM Sessions with %s", name); + fprintf(fd, "</TITLE></HEAD><BODY BGCOLOR=\"ffffff\">\n"); } } @@ -1166,10 +1162,11 @@ if (stat(path, &st) == 0 && S_ISDIR(st.st_mode)) { /* append a / if needed */ - if (path[strlen(path) - 1] != '/') + if (path[strlen(path) - 1] != '/') { name = g_strconcat(path, "/", NULL); - else + } else { name = g_strdup(path); + } gtk_file_selection_set_filename(GTK_FILE_SELECTION(w), name); g_free(name); return 1; @@ -1263,30 +1260,32 @@ dest += 4; } else { *dest++ = *src; - if (*src == '\0') return; - else src++; + if (*src == '\0') + return; + else + src++; } } } -void away_on_login (char *mesg) +void away_on_login(char *mesg) { GSList *awy = away_messages; struct away_message *a, *message = NULL; - + if (!blist) { return; } if (mesg == NULL) { /* Use default message */ - do_away_message((GtkWidget*)NULL, default_away); + do_away_message((GtkWidget *)NULL, default_away); } else { /* Use argument */ while (awy) { a = (struct away_message *)awy->data; - if (strcmp (a->name, mesg) == 0) { + if (strcmp(a->name, mesg) == 0) { message = a; break; } @@ -1294,7 +1293,7 @@ } if (message == NULL) message = default_away; - do_away_message((GtkWidget*)NULL, message); + do_away_message((GtkWidget *)NULL, message); } return; } @@ -1322,32 +1321,32 @@ switch (what) { case log_signon: g_snprintf(text, sizeof(text), "+++ %s (%s) signed on @ %s", - gc->username, (*gc->prpl->name)(), full_date()); + gc->username, (*gc->prpl->name)(), full_date()); g_snprintf(html, sizeof(html), "<B>%s</B>", text); break; case log_signoff: g_snprintf(text, sizeof(text), "+++ %s (%s) signed off @ %s", - gc->username, (*gc->prpl->name)(), full_date()); + gc->username, (*gc->prpl->name)(), full_date()); g_snprintf(html, sizeof(html), "<I><FONT COLOR=GRAY>%s</FONT></I>", text); break; case log_away: g_snprintf(text, sizeof(text), "+++ %s (%s) changed away state @ %s", - gc->username, (*gc->prpl->name)(), full_date()); + gc->username, (*gc->prpl->name)(), full_date()); g_snprintf(html, sizeof(html), "<FONT COLOR=OLIVE>%s</FONT>", text); break; case log_back: g_snprintf(text, sizeof(text), "+++ %s (%s) came back @ %s", - gc->username, (*gc->prpl->name)(), full_date()); + gc->username, (*gc->prpl->name)(), full_date()); g_snprintf(html, sizeof(html), "%s", text); break; case log_idle: g_snprintf(text, sizeof(text), "+++ %s (%s) became idle @ %s", - gc->username, (*gc->prpl->name)(), full_date()); + gc->username, (*gc->prpl->name)(), full_date()); g_snprintf(html, sizeof(html), "<FONT COLOR=GRAY>%s</FONT>", text); break; case log_unidle: g_snprintf(text, sizeof(text), "+++ %s (%s) returned from idle @ %s", - gc->username, (*gc->prpl->name)(), full_date()); + gc->username, (*gc->prpl->name)(), full_date()); g_snprintf(html, sizeof(html), "%s", text); break; case log_quit: @@ -1359,32 +1358,33 @@ switch (what) { case log_signon: g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) signed on @ %s", - gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); + gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); g_snprintf(html, sizeof(html), "<B>%s</B>", text); break; case log_signoff: g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) signed off @ %s", - gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); + gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); g_snprintf(html, sizeof(html), "<I><FONT COLOR=GRAY>%s</FONT></I>", text); break; case log_away: g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) went away @ %s", - gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); + gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); g_snprintf(html, sizeof(html), "<FONT COLOR=OLIVE>%s</FONT>", text); break; case log_back: g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) came back @ %s", - gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); + gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); g_snprintf(html, sizeof(html), "%s", text); break; case log_idle: g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) became idle @ %s", - gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); + gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); g_snprintf(html, sizeof(html), "<FONT COLOR=GRAY>%s</FONT>", text); break; case log_unidle: - g_snprintf(text, sizeof(text), "%s (%s) reported that %s (%s) returned from idle @ %s", - gc->username, (*gc->prpl->name)(), who->show, who->name, full_date()); + g_snprintf(text, sizeof(text), + "%s (%s) reported that %s (%s) returned from idle @ %s", gc->username, + (*gc->prpl->name)(), who->show, who->name, full_date()); g_snprintf(html, sizeof(html), "%s", text); break; default: @@ -1396,32 +1396,33 @@ switch (what) { case log_signon: g_snprintf(text, sizeof(text), "%s (%s) reported that %s signed on @ %s", - gc->username, (*gc->prpl->name)(), who->name, full_date()); + gc->username, (*gc->prpl->name)(), who->name, full_date()); g_snprintf(html, sizeof(html), "<B>%s</B>", text); break; case log_signoff: g_snprintf(text, sizeof(text), "%s (%s) reported that %s signed off @ %s", - gc->username, (*gc->prpl->name)(), who->name, full_date()); + gc->username, (*gc->prpl->name)(), who->name, full_date()); g_snprintf(html, sizeof(html), "<I><FONT COLOR=GRAY>%s</FONT></I>", text); break; case log_away: g_snprintf(text, sizeof(text), "%s (%s) reported that %s went away @ %s", - gc->username, (*gc->prpl->name)(), who->name, full_date()); + gc->username, (*gc->prpl->name)(), who->name, full_date()); g_snprintf(html, sizeof(html), "<FONT COLOR=OLIVE>%s</FONT>", text); break; case log_back: g_snprintf(text, sizeof(text), "%s (%s) reported that %s came back @ %s", - gc->username, (*gc->prpl->name)(), who->name, full_date()); + gc->username, (*gc->prpl->name)(), who->name, full_date()); g_snprintf(html, sizeof(html), "%s", text); break; case log_idle: g_snprintf(text, sizeof(text), "%s (%s) reported that %s became idle @ %s", - gc->username, (*gc->prpl->name)(), who->name, full_date()); + gc->username, (*gc->prpl->name)(), who->name, full_date()); g_snprintf(html, sizeof(html), "<FONT COLOR=GRAY>%s</FONT>", text); break; case log_unidle: - g_snprintf(text, sizeof(text), "%s (%s) reported that %s returned from idle @ %s", - gc->username, (*gc->prpl->name)(), who->name, full_date()); + g_snprintf(text, sizeof(text), + "%s (%s) reported that %s returned from idle @ %s", gc->username, + (*gc->prpl->name)(), who->name, full_date()); g_snprintf(html, sizeof(html), "%s", text); break; default: @@ -1445,7 +1446,7 @@ unsigned char *utf8_to_str(unsigned char *in) { - int n = 0,i = 0; + int n = 0, i = 0; int inlen; unsigned char *result; @@ -1454,27 +1455,31 @@ inlen = strlen(in); - result = g_malloc(inlen+1); + result = g_malloc(inlen + 1); - while(n <= inlen-1) { + while (n <= inlen - 1) { long c = (long)in[n]; - if(c<0x80) + if (c < 0x80) result[i++] = (char)c; else { - if((c&0xC0) == 0xC0) - result[i++] = (char)(((c&0x03)<<6)|(((unsigned char)in[++n])&0x3F)); - else if((c&0xE0) == 0xE0) { + if ((c & 0xC0) == 0xC0) + result[i++] = + (char)(((c & 0x03) << 6) | (((unsigned char)in[++n]) & 0x3F)); + else if ((c & 0xE0) == 0xE0) { if (n + 2 <= inlen) { - result[i] = (char)(((c&0xF)<<4)|(((unsigned char)in[++n])&0x3F)); - result[i] = (char)(((unsigned char)result[i]) |(((unsigned char)in[++n])&0x3F)); + result[i] = + (char)(((c & 0xF) << 4) | (((unsigned char)in[++n]) & 0x3F)); + result[i] = + (char)(((unsigned char)result[i]) | + (((unsigned char)in[++n]) & 0x3F)); i++; - } else n += 2; - } - else if((c&0xF0) == 0xF0) + } else + n += 2; + } else if ((c & 0xF0) == 0xF0) n += 3; - else if((c&0xF8) == 0xF8) + else if ((c & 0xF8) == 0xF8) n += 4; - else if((c&0xFC) == 0xFC) + else if ((c & 0xFC) == 0xFC) n += 5; } n++; @@ -1486,7 +1491,7 @@ char *str_to_utf8(unsigned char *in) { - int n = 0,i = 0; + int n = 0, i = 0; int inlen; char *result = NULL; @@ -1509,13 +1514,14 @@ continue; } if ((c == 0x0D) || (c == 0x0A)) { - n++; continue; + n++; + continue; } if (c < 128) result[i++] = (char)c; else { - result[i++] = (char)((c>>6)|192); - result[i++] = (char)((c&63)|128); + result[i++] = (char)((c >> 6) | 192); + result[i++] = (char)((c & 63) | 128); } n++; }