# HG changeset patch
# User Casey Harkins <charkins@pidgin.im>
# Date 1193591326 0
# Node ID 8c5e34b6782dd228b5cf8a2e6a8e5d3bf91e5fd6
# Parent  aedc15fa64fb669952e69898472e7f16f97b4217# Parent  cb9edb91a2e52866455ae9a038ecdbcce5aee03d
merge of 'a9988692f118a65a6c2ebdfc62abfed71e403153'
     and 'f13ef49228ccfc9d640e0b8f38751c6a6407989a'

diff -r aedc15fa64fb -r 8c5e34b6782d pidgin/gtkdocklet.c
--- 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;
 }