[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / shell / ev-sidebar.c

diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index f15b376acd92078cd6928c5af9ed5b3e182283e5..c2b2c53beda0fd29425c4eee1cb2872370020bf6 100644 (file)
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -17,7 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -64,7 +64,7 @@ G_DEFINE_TYPE (EvSidebar, ev_sidebar, GTK_TYPE_VBOX)
                (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR, EvSidebarPrivate))
 
 static void
-ev_sidebar_destroy (GtkObject *object)
+ev_sidebar_dispose (GObject *object)
 {
        EvSidebar *ev_sidebar = EV_SIDEBAR (object);
 
@@ -79,7 +79,7 @@ ev_sidebar_destroy (GtkObject *object)
        }
                
           
-       (* GTK_OBJECT_CLASS (ev_sidebar_parent_class)->destroy) (object);
+       G_OBJECT_CLASS (ev_sidebar_parent_class)->dispose (object);
 }
 
 static void
@@ -175,17 +175,11 @@ ev_sidebar_get_property (GObject *object,
 static void
 ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
 {
-       GObjectClass *g_object_class;
-       GtkWidgetClass *widget_class;
-       GtkObjectClass *gtk_object_klass;
- 
-       g_object_class = G_OBJECT_CLASS (ev_sidebar_class);
-       widget_class = GTK_WIDGET_CLASS (ev_sidebar_class);
-       gtk_object_klass = GTK_OBJECT_CLASS (ev_sidebar_class);
-          
+        GObjectClass *g_object_class = G_OBJECT_CLASS (ev_sidebar_class);
+
        g_type_class_add_private (g_object_class, sizeof (EvSidebarPrivate));
-          
-       gtk_object_klass->destroy = ev_sidebar_destroy;
+
+       g_object_class->dispose = ev_sidebar_dispose;
        g_object_class->get_property = ev_sidebar_get_property;
        g_object_class->set_property = ev_sidebar_set_property;
 
@@ -205,17 +199,19 @@ ev_sidebar_menu_position_under (GtkMenu  *menu,
                                gboolean *push_in,
                                gpointer  user_data)
 {
-       GtkWidget *widget;
+       GtkWidget    *widget;
+       GtkAllocation allocation;
 
        g_return_if_fail (GTK_IS_BUTTON (user_data));
-       g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data));
+       g_return_if_fail (!gtk_widget_get_has_window (GTK_WIDGET (user_data)));
 
        widget = GTK_WIDGET (user_data);
           
-       gdk_window_get_origin (widget->window, x, y);
+       gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
+       gtk_widget_get_allocation (widget, &allocation);
           
-       *x += widget->allocation.x;
-       *y += widget->allocation.y + widget->allocation.height;
+       *x += allocation.x;
+       *y += allocation.y + allocation.height;
           
        *push_in = FALSE;
 }
@@ -229,11 +225,13 @@ ev_sidebar_select_button_press_cb (GtkWidget      *widget,
 
        if (event->button == 1) {
                GtkRequisition requisition;
+               GtkAllocation allocation;
                gint width;
-               
-               width = widget->allocation.width;
+
+               gtk_widget_get_allocation (widget, &allocation);
+               width = allocation.width;
                gtk_widget_set_size_request (ev_sidebar->priv->menu, -1, -1);
-               gtk_widget_size_request (ev_sidebar->priv->menu, &requisition);
+                gtk_widget_get_preferred_size (ev_sidebar->priv->menu, &requisition, NULL);
                gtk_widget_set_size_request (ev_sidebar->priv->menu,
                                             MAX (width, requisition.width), -1);
                
@@ -257,10 +255,10 @@ ev_sidebar_select_button_key_press_cb (GtkWidget   *widget,
 {
        EvSidebar *ev_sidebar = EV_SIDEBAR (user_data);
           
-       if (event->keyval == GDK_space ||
-           event->keyval == GDK_KP_Space ||
-           event->keyval == GDK_Return ||
-           event->keyval == GDK_KP_Enter) {
+       if (event->keyval == GDK_KEY_space ||
+           event->keyval == GDK_KEY_KP_Space ||
+           event->keyval == GDK_KEY_Return ||
+           event->keyval == GDK_KEY_KP_Enter) {
                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
                gtk_menu_popup (GTK_MENU (ev_sidebar->priv->menu),
                                NULL, NULL, ev_sidebar_menu_position_under, widget,