11 files changed, 12 insertions, 15 deletions
diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am
index 209c4b6b..0702c17e 100644
--- a/mate-panel/Makefile.am
+++ b/mate-panel/Makefile.am
@@ -49,7 +49,7 @@ panel_sources = \
 	panel-toplevel.c \
 	panel-struts.c \
 	panel-frame.c \
-	panel-multiscreen.c \
+	panel-multimonitor.c \
 	panel-a11y.c \
 	panel-bindings.c \
 	panel-layout.c \
@@ -104,7 +104,7 @@ panel_headers = \
 	panel-toplevel.h \
 	panel-struts.h \
 	panel-frame.h \
-	panel-multiscreen.h \
+	panel-multimonitor.h \
 	panel-a11y.h \
 	panel-bindings.h \
 	panel-layout.h \
diff --git a/mate-panel/launcher.c b/mate-panel/launcher.c
index a0246993..470c0d04 100644
--- a/mate-panel/launcher.c
+++ b/mate-panel/launcher.c
@@ -39,7 +39,6 @@
 #include "panel-toplevel.h"
 #include "panel-a11y.h"
 #include "panel-globals.h"
-#include "panel-multiscreen.h"
 #include "panel-lockdown.h"
 #include "panel-ditem-editor.h"
 #include "panel-icon-names.h"
diff --git a/mate-panel/main.c b/mate-panel/main.c
index b779939c..067ee993 100644
--- a/mate-panel/main.c
+++ b/mate-panel/main.c
@@ -23,7 +23,7 @@
 #include "panel-profile.h"
 #include "panel-config-global.h"
 #include "panel-shell.h"
-#include "panel-multiscreen.h"
+#include "panel-multimonitor.h"
 #include "panel-session.h"
 #include "panel-schemas.h"
 #include "panel-stock-icons.h"
diff --git a/mate-panel/panel-multiscreen.c b/mate-panel/panel-multimonitor.c
index 04f42666..c370838b 100644
--- a/mate-panel/panel-multiscreen.c
+++ b/mate-panel/panel-multimonitor.c
@@ -1,5 +1,5 @@
 /*
- * panel-multiscreen.c: Multi-screen and Xinerama support for the panel.
+ * panel-multimonitor.c: Multi-monitor and Xinerama support for the panel.
  *
  * Copyright (C) 2001 George Lebl <[email protected]>
  *               2002 Sun Microsystems Inc.
diff --git a/mate-panel/panel-multiscreen.h b/mate-panel/panel-multimonitor.h
index d1f0a77f..44ae962e 100644
--- a/mate-panel/panel-multiscreen.h
+++ b/mate-panel/panel-multimonitor.h
@@ -1,5 +1,5 @@
 /*
- * panel-multiscreen.h: Multi-screen and Xinerama support for the panel.
+ * panel-multimonitor.h: Multi-monitor and Xinerama support for the panel.
  *
  * Copyright (C) 2001 George Lebl <[email protected]>
  *               2002 Sun Microsystems Inc.
@@ -23,8 +23,8 @@
  *          Mark McLoughlin <[email protected]>
  */
 
-#ifndef __PANEL_MULTISCREEN_H__
-#define __PANEL_MULTISCREEN_H__
+#ifndef __PANEL_MULTIMONITOR_H__
+#define __PANEL_MULTIMONITOR_H__
 
 #include <gtk/gtk.h>
 
@@ -53,4 +53,4 @@ void    panel_multiscreen_is_at_visible_extreme (GdkScreen *screen,
 						 gboolean  *topmost,
 						 gboolean  *bottommost);
 
-#endif /* __PANEL_MULTISCREEN_H__ */
+#endif /* __PANEL_MULTIMONITOR_H__ */
diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c
index 7d787755..28549fd9 100644
--- a/mate-panel/panel-profile.c
+++ b/mate-panel/panel-profile.c
@@ -41,7 +41,7 @@
 #include "panel.h"
 #include "panel-widget.h"
 #include "panel-util.h"
-#include "panel-multiscreen.h"
+#include "panel-multimonitor.h"
 #include "panel-toplevel.h"
 #include "panel-lockdown.h"
 #include "panel-schemas.h"
diff --git a/mate-panel/panel-recent.c b/mate-panel/panel-recent.c
index e111c157..e02b8d95 100644
--- a/mate-panel/panel-recent.c
+++ b/mate-panel/panel-recent.c
@@ -38,7 +38,6 @@
 #include "panel-globals.h"
 #include "panel-recent.h"
 #include "panel-stock-icons.h"
-#include "panel-multiscreen.h"
 #include "panel-icon-names.h"
 
 static gboolean
diff --git a/mate-panel/panel-run-dialog.c b/mate-panel/panel-run-dialog.c
index 5451b4d9..71dac005 100644
--- a/mate-panel/panel-run-dialog.c
+++ b/mate-panel/panel-run-dialog.c
@@ -57,7 +57,7 @@
 #include "panel-profile.h"
 #include "panel-schemas.h"
 #include "panel-stock-icons.h"
-#include "panel-multiscreen.h"
+#include "panel-multimonitor.h"
 #include "menu.h"
 #include "panel-lockdown.h"
 #include "panel-icon-names.h"
diff --git a/mate-panel/panel-struts.c b/mate-panel/panel-struts.c
index d5adccc4..c87eda3a 100644
--- a/mate-panel/panel-struts.c
+++ b/mate-panel/panel-struts.c
@@ -26,7 +26,7 @@
 
 #include "panel-struts.h"
 
-#include "panel-multiscreen.h"
+#include "panel-multimonitor.h"
 #include "panel-xutils.h"
 
 
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
index c8e454ab..6c32f78e 100644
--- a/mate-panel/panel-toplevel.c
+++ b/mate-panel/panel-toplevel.c
@@ -39,7 +39,7 @@
 #include "panel-profile.h"
 #include "panel-frame.h"
 #include "panel-xutils.h"
-#include "panel-multiscreen.h"
+#include "panel-multimonitor.h"
 #include "panel-a11y.h"
 #include "panel-typebuiltins.h"
 #include "panel-marshal.h"
diff --git a/mate-panel/panel.c b/mate-panel/panel.c
index 58727bf0..a53dc2a5 100644
--- a/mate-panel/panel.c
+++ b/mate-panel/panel.c
@@ -41,7 +41,6 @@
 #include "panel-action-button.h"
 #include "panel-menu-bar.h"
 #include "panel-separator.h"
-#include "panel-multiscreen.h"
 #include "panel-toplevel.h"
 #include "panel-menu-button.h"
 #include "panel-globals.h"