Mercurial > pidgin.yaz
comparison src/applet.c @ 1420:9be6790092dc
[gaim-migrate @ 1430]
backing out the change mishan sent in. it's not working right for me for some reason and i don't feel like trying to figure out why right now.
committer: Tailor Script <tailor@pidgin.im>
author | Eric Warmenhoven <eric@warmenhoven.org> |
---|---|
date | Tue, 23 Jan 2001 12:08:21 +0000 |
parents | 42955549cdd9 |
children | 13a34fb4abb0 |
comparison
equal
deleted
inserted
replaced
1419:b37ed5eb0317 | 1420:9be6790092dc |
---|---|
242 GtkRequisition buddy_req, applet_req; | 242 GtkRequisition buddy_req, applet_req; |
243 GtkAllocation result; | 243 GtkAllocation result; |
244 GNOME_Panel_OrientType orient = applet_widget_get_panel_orient( APPLET_WIDGET(applet) ); | 244 GNOME_Panel_OrientType orient = applet_widget_get_panel_orient( APPLET_WIDGET(applet) ); |
245 pad = 5; | 245 pad = 5; |
246 | 246 |
247 gdk_window_get_root_origin(gtk_widget_get_parent_window(appletframe), &x, &y); | 247 gdk_window_get_position(gtk_widget_get_parent_window(appletframe), &x, &y); |
248 if (for_blist) { | 248 if (for_blist) { |
249 if (general_options & OPT_GEN_SAVED_WINDOWS) { | 249 if (general_options & OPT_GEN_SAVED_WINDOWS) { |
250 buddy_req.width = blist_pos.width; | 250 buddy_req.width = blist_pos.width; |
251 buddy_req.height = blist_pos.height; | 251 buddy_req.height = blist_pos.height; |
252 } else { | 252 } else { |
284 if (blist) gtk_widget_show(blist); | 284 if (blist) gtk_widget_show(blist); |
285 al = get_applet_pos(TRUE); | 285 al = get_applet_pos(TRUE); |
286 if (general_options & OPT_GEN_NEAR_APPLET) | 286 if (general_options & OPT_GEN_NEAR_APPLET) |
287 gtk_widget_set_uposition ( blist, al.x, al.y ); | 287 gtk_widget_set_uposition ( blist, al.x, al.y ); |
288 else if (general_options & OPT_GEN_SAVED_WINDOWS) | 288 else if (general_options & OPT_GEN_SAVED_WINDOWS) |
289 gtk_widget_set_uposition(blist, blist_pos.x, blist_pos.y); | 289 gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff, blist_pos.y - blist_pos.yoff); |
290 } | 290 } |
291 | 291 |
292 void AppletClicked( GtkWidget *sender, GdkEventButton *ev, gpointer data ){ | 292 void AppletClicked( GtkWidget *sender, GdkEventButton *ev, gpointer data ){ |
293 if (!ev || ev->button != 1 || ev->type != GDK_BUTTON_PRESS) | 293 if (!ev || ev->button != 1 || ev->type != GDK_BUTTON_PRESS) |
294 return; | 294 return; |