Fix int<->uint problem

[geeqie.git] / src / fullscreen.c

diff --git a/src/fullscreen.c b/src/fullscreen.c
index c751229..4ae884c 100644 (file)
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -1,16 +1,24 @@
 /*
- * Geeqie
- * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Author: John Ellis
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
 #include "main.h"
 #include "fullscreen.h"
 
@@ -91,7 +99,7 @@ static void fullscreen_hide_mouse_reset(FullScreenData *fs)
        fs->hide_mouse_id = g_timeout_add(FULL_SCREEN_HIDE_MOUSE_DELAY, fullscreen_hide_mouse_cb, fs);
 }
 
-static gboolean fullscreen_mouse_moved(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean fullscreen_mouse_moved(GtkWidget *widget, GdkEventMotion *event, gpointer data)
 {
        FullScreenData *fs = data;
 
@@ -356,6 +364,8 @@ void fullscreen_stop(FullScreenData *fs)
 
        gtk_widget_destroy(fs->window);
 
+       gtk_window_present(GTK_WINDOW(fs->normal_window));
+
        g_free(fs);
 }
 
@@ -628,7 +638,6 @@ GtkWidget *fullscreen_prefs_selection_new(const gchar *text, gint *screen_value,
        GtkWidget *combo;
        GtkListStore *store;
        GtkCellRenderer *renderer;
-       GtkWidget *button = NULL;
        GList *list;
        GList *work;
        gint current = 0;
@@ -649,15 +658,6 @@ GtkWidget *fullscreen_prefs_selection_new(const gchar *text, gint *screen_value,
        gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer,
                                       "text", FS_MENU_COLUMN_NAME, NULL);
 
-       if (above_value)
-               {
-               button = pref_checkbox_new_int(vbox, _("Stay above other windows"),
-                                              *above_value, above_value);
-               gtk_widget_set_sensitive(button, *screen_value != -1);
-
-               g_object_set_data(G_OBJECT(combo), BUTTON_ABOVE_KEY, button);
-               }
-
        fullscreen_prefs_selection_add(store, _("Determined by Window Manager"), -1);
        fullscreen_prefs_selection_add(store, _("Active screen"), 0);
        if (*screen_value == 0) current = 1;