Mercurial > pidgin.yaz
changeset 3063:22c84cbcd5a6
[gaim-migrate @ 3077]
A buddy window placement fix by Marc Deslauriers and a compile fix from Benjamin Miller. Thanks guys. Also, an irc fix.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 16 Mar 2002 20:14:24 +0000 |
| parents | 7fedd5d56b66 |
| children | f0aaea918717 |
| files | src/applet.c src/buddy.c src/prefs.c src/protocols/irc/irc.c src/protocols/oscar/oscar.c |
| diffstat | 5 files changed, 47 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/applet.c Sat Mar 16 06:16:11 2002 +0000 +++ b/src/applet.c Sat Mar 16 20:14:24 2002 +0000 @@ -394,14 +394,15 @@ void createOnlinePopup() { GtkAllocation *al; - if (blist) - gtk_widget_show(blist); + if (!blist) + return; 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); + gtk_widget_show(blist); g_free(al); }
--- a/src/buddy.c Sat Mar 16 06:16:11 2002 +0000 +++ b/src/buddy.c Sat Mar 16 20:14:24 2002 +0000 @@ -2265,6 +2265,10 @@ gdk_window_get_position(blist->window, &x, &y); gdk_window_get_size(blist->window, &width, &height); +#ifdef USE_APPLET + if (applet_buddy_show){ +#endif + if (e->send_event) { /* Is a position event */ if (blist_pos.x != x || blist_pos.y != y) save = 1; @@ -2283,6 +2287,10 @@ if (save) save_prefs(); +#ifdef USE_APPLET + } +#endif + }
--- a/src/prefs.c Sat Mar 16 06:16:11 2002 +0000 +++ b/src/prefs.c Sat Mar 16 20:14:24 2002 +0000 @@ -586,6 +586,8 @@ #ifdef USE_APPLET gaim_button(_("Automatically show buddy list on sign on"), &blist_options, OPT_BLIST_APP_BUDDY_SHOW, vbox); + gaim_button(_("Display Buddy List near applet"), &blist_options, OPT_BLIST_NEAR_APPLET, vbox); + #endif gaim_button(_("Save Window Size/Position"), &blist_options, OPT_BLIST_SAVED_WINDOWS, vbox); @@ -595,10 +597,6 @@ gtk_widget_set_sensitive(button2, FALSE); gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), button2); -#ifdef USE_APPLET - gaim_button(_("Display Buddy List near applet"), &blist_options, OPT_BLIST_NEAR_APPLET, vbox); -#endif - frame = gtk_frame_new(_("Group Displays")); gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5); gtk_widget_show(frame);
--- a/src/protocols/irc/irc.c Sat Mar 16 06:16:11 2002 +0000 +++ b/src/protocols/irc/irc.c Sat Mar 16 20:14:24 2002 +0000 @@ -266,30 +266,45 @@ str = g_string_append(str, cur); cur = ++end; if (!g_strncasecmp(cur, "B>", 2)) { - bold = TRUE; - str = g_string_append_c(str, '\2'); + if (!bold) { + bold = TRUE; + str = g_string_append_c(str, '\2'); + } cur = cur + 2; } else if (!g_strncasecmp(cur, "I>", 2)) { /* use bold for italics too */ - italics = TRUE; - str = g_string_append_c(str, '\2'); + if (!italics) { + italics = TRUE; + str = g_string_append_c(str, '\2'); + } cur = cur + 2; } else if (!g_strncasecmp(cur, "U>", 2)) { - underline = TRUE; - str = g_string_append_c(str, '\37'); + if (!underline) { + underline = TRUE; + str = g_string_append_c(str, '\37'); + } cur = cur + 2; - } else if (!g_strncasecmp(cur, "/B>", 3) && bold) { - bold = FALSE; - str = g_string_append_c(str, '\2'); + } else if (!g_strncasecmp(cur, "/B>", 3)) { + if (bold) { + bold = FALSE; + str = g_string_append_c(str, '\2'); + } cur = cur + 3; - } else if (!g_strncasecmp(cur, "/I>", 3) && italics) { - bold = FALSE; - str = g_string_append_c(str, '\2'); + } else if (!g_strncasecmp(cur, "/I>", 3)) { + if (italics) { + italics = FALSE; + str = g_string_append_c(str, '\2'); + } cur = cur + 3; - } else if (!g_strncasecmp(cur, "/U>", 3) && underline) { - bold = FALSE; - str = g_string_append_c(str, '\37'); + } else if (!g_strncasecmp(cur, "/U>", 3)) { + if (underline) { + underline = FALSE; + str = g_string_append_c(str, '\37'); + } cur = cur + 3; + } else { + str = g_string_append_c(str, '<'); } + } str = g_string_append(str, cur); return str;
--- a/src/protocols/oscar/oscar.c Sat Mar 16 06:16:11 2002 +0000 +++ b/src/protocols/oscar/oscar.c Sat Mar 16 20:14:24 2002 +0000 @@ -58,6 +58,10 @@ #include "pixmaps/gnomeicu-occ.xpm" #include "pixmaps/gnomeicu-ffc.xpm" +#if defined(__SVR4) && !defined(_SOCKLEN_T) +typedef uint32_t socklen_t; +#endif + /* constants to identify proto_opts */ #define USEROPT_AUTH 0 #define USEROPT_AUTHPORT 1