From 2b0f8c2f1ecdb4b31c07d77a246eb43dea58007a Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Tue, 14 Aug 2012 15:15:51 +0200
Subject: [PATCH] Removed 'device' from monitor callback.

---
 include/GL/glfw3.h | 4 ++--
 src/internal.h     | 2 +-
 src/monitor.c      | 2 +-
 tests/events.c     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index c3f2a2c0..00f832f0 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -497,7 +497,7 @@ typedef void (* GLFWcursorenterfun)(GLFWwindow,int);
 typedef void (* GLFWscrollfun)(GLFWwindow,double,double);
 typedef void (* GLFWkeyfun)(GLFWwindow,int,int);
 typedef void (* GLFWcharfun)(GLFWwindow,int);
-typedef void (* GLFWmonitordevicefun)(GLFWmonitor,int);
+typedef void (* GLFWmonitorfun)(GLFWmonitor,int);
 
 /* The video mode structure used by glfwGetVideoModes */
 typedef struct
@@ -534,7 +534,7 @@ GLFWAPI const char* glfwErrorString(int error);
 GLFWAPI void glfwSetErrorCallback(GLFWerrorfun cbfun);
 
 /* Monitor callback registration */
-GLFWAPI void glfwSetMonitorDeviceCallback(GLFWmonitordevicefun cbfun);
+GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun);
 
 /* Monitor attributes */
 GLFWAPI void glfwSetMonitorUserPointer(GLFWmonitor monitor, void* pointer);
diff --git a/src/internal.h b/src/internal.h
index 74a91300..266892e5 100755
--- a/src/internal.h
+++ b/src/internal.h
@@ -256,7 +256,7 @@ struct _GLFWlibrary
     GLFWscrollfun        scrollCallback;
     GLFWkeyfun           keyCallback;
     GLFWcharfun          charCallback;
-    GLFWmonitordevicefun monitorCallback;
+    GLFWmonitorfun       monitorCallback;
 
     GLFWgammaramp currentRamp;
     GLFWgammaramp originalRamp;
diff --git a/src/monitor.c b/src/monitor.c
index d30b7c37..3ce80f41 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -137,7 +137,7 @@ GLFWAPI const char* glfwGetMonitorString(GLFWmonitor handle, int param)
 // Set a callback function for monitor events
 //========================================================================
 
-GLFWAPI void glfwSetMonitorDeviceCallback(GLFWmonitordevicefun cbfun)
+GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun)
 {
     if (!_glfwInitialized)
     {
diff --git a/tests/events.c b/tests/events.c
index c7a46493..0bed007c 100644
--- a/tests/events.c
+++ b/tests/events.c
@@ -394,7 +394,7 @@ int main(void)
     glfwSetScrollCallback(scroll_callback);
     glfwSetKeyCallback(key_callback);
     glfwSetCharCallback(char_callback);
-    glfwSetMonitorDeviceCallback(monitor_callback);
+    glfwSetMonitorCallback(monitor_callback);
 
     window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Event Linter", NULL);
     if (!window)