Mercurial > pidgin.yaz
diff pidgin/gtkdocklet-x11.c @ 20889:d41c5443f443
merge of 'bb426e3c52ba2442bfbf7ec6159714fca242cb92'
and 'd35dd87d97af4087e74e0a16d574533ab62dad8f'
author | Casey Harkins <charkins@pidgin.im> |
---|---|
date | Sun, 28 Oct 2007 17:08:49 +0000 |
parents | d3e0eb05ac94 |
children | f16534ec2897 2a591a5b3322 |
line wrap: on
line diff
--- a/pidgin/gtkdocklet-x11.c Sun Oct 28 17:08:46 2007 +0000 +++ b/pidgin/gtkdocklet-x11.c Sun Oct 28 17:08:49 2007 +0000 @@ -229,35 +229,6 @@ } static gboolean -docklet_x11_get_geometry(gint *x, gint *y, gint *w, gint *h) -{ - int lx,ly; - GtkWidget *widget = GTK_WIDGET(docklet); - - if(docklet==NULL) return FALSE; - - gdk_window_get_origin(GDK_WINDOW(widget->window), &lx, &ly); - - if(x!=NULL) *x = lx + widget->allocation.x; - if(y!=NULL) *y = ly + widget->allocation.y; - - if(w!=NULL) *w = widget->allocation.width; - if(h!=NULL) *h = widget->allocation.height; - - return TRUE; -} - -static GObject * -docklet_x11_get_gdk_screen() -{ -#if GTK_CHECK_VERSION(2,2,0) - return (GObject *)gtk_widget_get_screen(GTK_WIDGET(docklet)); -#else - return NULL; -#endif -} - -static gboolean docklet_x11_embed_timeout_cb() { /* The docklet was not embedded within the timeout. @@ -342,12 +313,10 @@ docklet_x11_blank_icon, docklet_x11_set_tooltip, #if GTK_CHECK_VERSION(2,2,0) - docklet_x11_position_menu, + docklet_x11_position_menu #else - NULL, + NULL #endif - docklet_x11_get_geometry, - docklet_x11_get_gdk_screen }; void