Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv25898/src
Modified Files:
applet.c buddy.c prefs.c
Log Message:
A buddy window placement fix by Marc Deslauriers and a compile fix from Benjamin Miller. Thanks guys. Also, an irc fix.
Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- applet.c 23 Feb 2002 23:28:49 -0000 1.28
+++ applet.c 16 Mar 2002 20:14:24 -0000 1.29
@@ -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);
}
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- buddy.c 16 Mar 2002 00:32:53 -0000 1.292
+++ buddy.c 16 Mar 2002 20:14:24 -0000 1.293
@@ -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
+
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- prefs.c 16 Mar 2002 00:32:53 -0000 1.218
+++ prefs.c 16 Mar 2002 20:14:24 -0000 1.219
@@ -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);
|
