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

[evince.git] / libview / ev-view-cursor.c

diff --git a/libview/ev-view-cursor.c b/libview/ev-view-cursor.c
index 6411712a4212a218ad2ebdb04af95c4fc134f6c0..58d04a27dd926922dcad24d76bafb184c7cedec6 100644 (file)
--- a/libview/ev-view-cursor.c
+++ b/libview/ev-view-cursor.c
@@ -14,23 +14,11 @@
  *
  * 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.
  */
 
 #include "ev-view-cursor.h"
 
-static GdkCursor *
-ev_view_create_invisible_cursor (void)
-{
-       GdkBitmap *empty;
-       GdkColor black = { 0, 0, 0, 0 };
-       static char bits[] = { 0x00 };
-
-       empty = gdk_bitmap_create_from_data (NULL, bits, 1, 1);
-
-       return gdk_cursor_new_from_pixmap (empty, empty, &black, &black, 0, 0);
-}
-
 GdkCursor *
 ev_view_cursor_new (GdkDisplay  *display,
                    EvViewCursor new_cursor)
@@ -50,7 +38,7 @@ ev_view_cursor_new (GdkDisplay  *display,
                cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
                break;
        case EV_VIEW_CURSOR_HIDDEN:
-               cursor = ev_view_create_invisible_cursor ();
+               cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
                break;
        case EV_VIEW_CURSOR_DRAG:
                cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
@@ -58,6 +46,9 @@ ev_view_cursor_new (GdkDisplay  *display,
        case EV_VIEW_CURSOR_AUTOSCROLL:
                cursor = gdk_cursor_new_for_display (display, GDK_DOUBLE_ARROW);
                break;
+       case EV_VIEW_CURSOR_ADD:
+               cursor = gdk_cursor_new_for_display (display, GDK_PLUS);
+               break;
        }
 
        return cursor;