Mercurial > pidgin.yaz
diff pidgin/gtkdocklet.c @ 20887:8c5e34b6782d
merge of 'a9988692f118a65a6c2ebdfc62abfed71e403153'
and 'f13ef49228ccfc9d640e0b8f38751c6a6407989a'
| author | Casey Harkins <charkins@pidgin.im> |
|---|---|
| date | Sun, 28 Oct 2007 17:08:46 +0000 |
| parents | aedc15fa64fb cb9edb91a2e5 |
| children | d41c5443f443 |
line wrap: on
line diff
--- a/pidgin/gtkdocklet.c Sun Oct 28 17:07:48 2007 +0000 +++ b/pidgin/gtkdocklet.c Sun Oct 28 17:08:46 2007 +0000 @@ -712,14 +712,16 @@ gboolean pidgin_docklet_get_geometry(gint *x, gint *y, gint *w, gint *h) { - if(visible && ui_ops && ui_ops->get_geometry) return ui_ops->get_geometry(x, y, w, h); + if(!visible) return FALSE; + if(ui_ops && ui_ops->get_geometry) return ui_ops->get_geometry(x, y, w, h); return FALSE; } GObject * pidgin_docklet_get_gdk_screen() { - if(visible && ui_ops && ui_ops->get_gdk_screen) return ui_ops->get_gdk_screen(); + if(!visible) return NULL; + if(ui_ops && ui_ops->get_gdk_screen) return ui_ops->get_gdk_screen(); return NULL; }