22 files changed, 75 insertions, 79 deletions

diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am
index 879dc07a..a7ea3944 100644
--- a/mate-panel/Makefile.am
+++ b/mate-panel/Makefile.am
@@ -40,8 +40,8 @@ panel_sources = \
 	menu.c \
 	panel-context-menu.c \
 	launcher.c \
-	mate-panel-applet-frame.c \
-	mate-panel-applets-manager.c \
+	panel-applet-frame.c \
+	panel-applets-manager.c \
 	panel-shell.c \
 	panel-background.c \
 	panel-background-monitor.c \
@@ -67,7 +67,7 @@ panel_sources = \
 	panel-addto.c \
 	panel-ditem-editor.c \
 	panel-modules.c \
-	mate-panel-applet-info.c \
+	panel-applet-info.c \
 	panel-reset.c
 
 panel_headers = \
@@ -87,8 +87,8 @@ panel_headers = \
 	menu.h \
 	panel-context-menu.h \
 	launcher.h \
-	mate-panel-applet-frame.h \
-	mate-panel-applets-manager.h \
+	panel-applet-frame.h \
+	panel-applets-manager.h \
 	panel-shell.h \
 	panel-background.h \
 	panel-background-monitor.h \
@@ -117,7 +117,7 @@ panel_headers = \
 	panel-ditem-editor.h \
 	panel-icon-names.h \
 	panel-modules.h \
-	mate-panel-applet-info.h \
+	panel-applet-info.h \
 	panel-reset.h \
 	panel-schemas.h
 
@@ -158,8 +158,8 @@ mate_desktop_item_edit_LDADD = \
 
 mate_panel_test_applets_SOURCES = \
 	panel-modules.c \
-	mate-panel-applet-info.c \
-	mate-panel-applets-manager.c \
+	panel-applet-info.c \
+	panel-applets-manager.c \
 	panel-marshal.c \
 	panel-test-applets.c
 
diff --git a/mate-panel/applet.c b/mate-panel/applet.c
index 9fdadf53..c7115379 100644
--- a/mate-panel/applet.c
+++ b/mate-panel/applet.c
@@ -22,7 +22,7 @@
 #include "launcher.h"
 #include "panel-addto.h"
 #include "panel-config-global.h"
-#include "mate-panel-applet-frame.h"
+#include "panel-applet-frame.h"
 #include "panel-action-button.h"
 #include "panel-menu-bar.h"
 #include "panel-separator.h"
diff --git a/mate-panel/libmate-panel-applet-private/Makefile.am b/mate-panel/libmate-panel-applet-private/Makefile.am
index 9dd4b631..76d122d0 100644
--- a/mate-panel/libmate-panel-applet-private/Makefile.am
+++ b/mate-panel/libmate-panel-applet-private/Makefile.am
@@ -17,18 +17,18 @@ AM_CPPFLAGS =							\
 AM_CFLAGS = $(WARN_CFLAGS)
 
 libmate_panel_applet_private_la_SOURCES =	\
-	mate-panel-applets-manager-dbus.c	\
-	mate-panel-applets-manager-dbus.h	\
-	mate-panel-applet-container.c	\
-	mate-panel-applet-container.h	\
-	mate-panel-applet-frame-dbus.c	\
-	mate-panel-applet-frame-dbus.h
+	panel-applets-manager-dbus.c	\
+	panel-applets-manager-dbus.h	\
+	panel-applet-container.c	\
+	panel-applet-container.h	\
+	panel-applet-frame-dbus.c	\
+	panel-applet-frame-dbus.h
 
 libmate_panel_applet_private_mini_la_SOURCES =\
-	mate-panel-applet-mini.c		\
-	mate-panel-applets-manager-dbus.c	\
-	mate-panel-applets-manager-dbus.h	\
-	mate-panel-applet-container.c	\
-	mate-panel-applet-container.h
+	panel-applet-mini.c		\
+	panel-applets-manager-dbus.c	\
+	panel-applets-manager-dbus.h	\
+	panel-applet-container.c	\
+	panel-applet-container.h
 
 -include $(top_srcdir)/git.mk
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.c b/mate-panel/libmate-panel-applet-private/panel-applet-container.c
index 3b6a1102..7aa34d6a 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-container.c
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applet-container.c: a container for applets.
+ * panel-applet-container.c: a container for applets.
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  *
@@ -25,7 +25,7 @@
 #if GTK_CHECK_VERSION (3, 0, 0)
 #include <gtk/gtkx.h>
 #endif
-#include "mate-panel-applet-container.h"
+#include "panel-applet-container.h"
 #include "panel-marshal.h"
 
 struct _MatePanelAppletContainerPrivate {
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.h b/mate-panel/libmate-panel-applet-private/panel-applet-container.h
index 8f01db80..108a38c9 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-container.h
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-container.h
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applet-container.c: a container for applets.
+ * panel-applet-container.h: a container for applets.
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  *
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef __MATE_PANEL_APPLET_CONTAINER_H__
-#define __MATE_PANEL_APPLET_CONTAINER_H__
+#ifndef __PANEL_APPLET_CONTAINER_H__
+#define __PANEL_APPLET_CONTAINER_H__
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -116,4 +116,4 @@ GVariant  *mate_panel_applet_container_child_get_finish        (MatePanelAppletC
 }
 #endif
 
-#endif /* __MATE_PANEL_APPLET_CONTAINER_H__ */
+#endif /* __PANEL_APPLET_CONTAINER_H__ */
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
index ca70915e..9330db0d 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * mate-panel-applet-frame-dbus.c: panel side container for applets
+ * panel-applet-frame-dbus.c: panel side container for applets
  *
  * Copyright (C) 2001 - 2003 Sun Microsystems, Inc.
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
@@ -29,12 +29,11 @@
 
 #include <string.h>
 
-#include <mate-panel-applet-frame.h>
-#include <mate-panel-applets-manager.h>
+#include <panel-applet-frame.h>
+#include <panel-applets-manager.h>
 
-#include "mate-panel-applet-container.h"
-
-#include "mate-panel-applet-frame-dbus.h"
+#include "panel-applet-container.h"
+#include "panel-applet-frame-dbus.h"
 
 G_DEFINE_TYPE (MatePanelAppletFrameDBus,
 	       mate_panel_applet_frame_dbus,
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.h b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.h
index 8b9e62a1..73da38f2 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.h
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.h
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applet-frame-dbus.h: panel side container for applets
+ * panel-applet-frame-dbus.h: panel side container for applets
  *
  * Copyright (C) 2001 - 2003 Sun Microsystems, Inc.
  * Copyright (C) 2010 Vincent Untz <[email protected]>
@@ -23,10 +23,10 @@
  *	Mark McLoughlin <[email protected]>
  */
 
-#ifndef __MATE_PANEL_APPLET_FRAME_DBUS_H__
-#define __MATE_PANEL_APPLET_FRAME_DBUS_H__
+#ifndef __PANEL_APPLET_FRAME_DBUS_H__
+#define __PANEL_APPLET_FRAME_DBUS_H__
 
-#include <mate-panel-applet-frame.h>
+#include <panel-applet-frame.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,4 +62,4 @@ gboolean  mate_panel_applet_frame_dbus_load               (const gchar
 }
 #endif
 
-#endif /* __MATE_PANEL_APPLET_FRAME_DBUS_H__ */
+#endif /* __PANEL_APPLET_FRAME_DBUS_H__ */
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-mini.c b/mate-panel/libmate-panel-applet-private/panel-applet-mini.c
index 13112376..13112376 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-mini.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-mini.c
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c
index fc2f817b..695f66fb 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.c
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applets-manager-dbus.c
+ * panel-applets-manager-dbus.c
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  * Copyright (C) 2010 Vincent Untz <[email protected]>
@@ -26,11 +26,10 @@
 #include <gmodule.h>
 #include <string.h>
 
-#include <mate-panel-applets-manager.h>
+#include <panel-applets-manager.h>
 
-#include "mate-panel-applet-frame-dbus.h"
-
-#include "mate-panel-applets-manager-dbus.h"
+#include "panel-applet-frame-dbus.h"
+#include "panel-applets-manager-dbus.h"
 
 G_DEFINE_TYPE_WITH_CODE (MatePanelAppletsManagerDBus,
 			 mate_panel_applets_manager_dbus,
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.h b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.h
index 0250ce54..85ab5c53 100644
--- a/mate-panel/libmate-panel-applet-private/mate-panel-applets-manager-dbus.h
+++ b/mate-panel/libmate-panel-applet-private/panel-applets-manager-dbus.h
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applets-manager-dbus.h
+ * panel-applets-manager-dbus.h
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  * Copyright (C) 2010 Vincent Untz <[email protected]>
@@ -20,10 +20,10 @@
  * 02110-1301, USA.
  */
 
-#ifndef __MATE_PANEL_APPLETS_MANAGER_DBUS_H__
-#define __MATE_PANEL_APPLETS_MANAGER_DBUS_H__
+#ifndef __PANEL_APPLETS_MANAGER_DBUS_H__
+#define __PANEL_APPLETS_MANAGER_DBUS_H__
 
-#include <mate-panel-applets-manager.h>
+#include <panel-applets-manager.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,4 +57,4 @@ GType mate_panel_applets_manager_dbus_get_type (void);
 }
 #endif
 
-#endif /* __MATE_PANEL_APPLETS_MANAGER_DBUS_H__ */
+#endif /* __PANEL_APPLETS_MANAGER_DBUS_H__ */
diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c
index 401fd9ed..09d4bcd9 100644
--- a/mate-panel/panel-addto.c
+++ b/mate-panel/panel-addto.c
@@ -36,8 +36,8 @@
 #include "launcher.h"
 #include "panel.h"
 #include "drawer.h"
-#include "mate-panel-applets-manager.h"
-#include "mate-panel-applet-frame.h"
+#include "panel-applets-manager.h"
+#include "panel-applet-frame.h"
 #include "panel-action-button.h"
 #include "panel-menu-bar.h"
 #include "panel-separator.h"
diff --git a/mate-panel/mate-panel-applet-frame.c b/mate-panel/panel-applet-frame.c
index e1115435..3610882e 100644
--- a/mate-panel/mate-panel-applet-frame.c
+++ b/mate-panel/panel-applet-frame.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * mate-panel-applet-frame.c: panel side container for applets
+ * panel-applet-frame.c: panel side container for applets
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  * Copyright (C) 2001 - 2003 Sun Microsystems, Inc.
@@ -33,7 +33,7 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
-#include "mate-panel-applets-manager.h"
+#include "panel-applets-manager.h"
 #include "panel-profile.h"
 #include "panel.h"
 #include "applet.h"
@@ -44,7 +44,7 @@
 #include "xstuff.h"
 #include "panel-schemas.h"
 
-#include "mate-panel-applet-frame.h"
+#include "panel-applet-frame.h"
 
 #define PANEL_RESPONSE_DELETE       0
 #define PANEL_RESPONSE_DONT_RELOAD  1
diff --git a/mate-panel/mate-panel-applet-frame.h b/mate-panel/panel-applet-frame.h
index ad5fbc75..50b700b4 100644
--- a/mate-panel/mate-panel-applet-frame.h
+++ b/mate-panel/panel-applet-frame.h
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applet-frame.h: panel side container for applets
+ * panel-applet-frame.h: panel side container for applets
  *
  * Copyright (C) 2001 - 2003 Sun Microsystems, Inc.
  *
@@ -21,8 +21,8 @@
  *	Mark McLoughlin <[email protected]>
  */
 
-#ifndef __MATE_PANEL_APPLET_FRAME_H__
-#define __MATE_PANEL_APPLET_FRAME_H__
+#ifndef __PANEL_APPLET_FRAME_H__
+#define __PANEL_APPLET_FRAME_H__
 
 #include <gtk/gtk.h>
 
@@ -143,5 +143,5 @@ void  _mate_panel_applet_frame_applet_lock           (MatePanelAppletFrame *fram
 }
 #endif
 
-#endif /* __MATE_PANEL_APPLET_FRAME_H__ */
+#endif /* __PANEL_APPLET_FRAME_H__ */
 
diff --git a/mate-panel/mate-panel-applet-info.c b/mate-panel/panel-applet-info.c
index 9f6dfc0a..10023ea5 100644
--- a/mate-panel/mate-panel-applet-info.c
+++ b/mate-panel/panel-applet-info.c
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applet-info.c
+ * panel-applet-info.c
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  * Copyright (C) 2010 Vincent Untz <[email protected]>
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include "mate-panel-applet-info.h"
+#include "panel-applet-info.h"
 
 struct _MatePanelAppletInfo {
 	gchar  *iid;
diff --git a/mate-panel/mate-panel-applet-info.h b/mate-panel/panel-applet-info.h
index b18ff5cc..fafef8b5 100644
--- a/mate-panel/mate-panel-applet-info.h
+++ b/mate-panel/panel-applet-info.h
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applet-info.h
+ * panel-applet-info.h
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  * Copyright (C) 2010 Vincent Untz <[email protected]>
@@ -20,8 +20,8 @@
  * MA  02110-1301, USA.
  */
 
-#ifndef __MATE_PANEL_APPLET_INFO_H__
-#define __MATE_PANEL_APPLET_INFO_H__
+#ifndef __PANEL_APPLET_INFO_H__
+#define __PANEL_APPLET_INFO_H__
 
 #include <glib.h>
 
@@ -48,4 +48,4 @@ const gchar * const *mate_panel_applet_info_get_old_ids                 (MatePan
 }
 #endif
 
-#endif /* __MATE_PANEL_APPLET_INFO_H__ */
+#endif /* __PANEL_APPLET_INFO_H__ */
diff --git a/mate-panel/mate-panel-applets-manager.c b/mate-panel/panel-applets-manager.c
index d4c53fbd..9568327e 100644
--- a/mate-panel/mate-panel-applets-manager.c
+++ b/mate-panel/panel-applets-manager.c
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applets-manager.c
+ * panel-applets-manager.c
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  * Copyright (C) 2010 Vincent Untz <[email protected]>
@@ -28,7 +28,7 @@
 
 #include "panel-modules.h"
 
-#include "mate-panel-applets-manager.h"
+#include "panel-applets-manager.h"
 
 G_DEFINE_ABSTRACT_TYPE (MatePanelAppletsManager, mate_panel_applets_manager, G_TYPE_OBJECT)
 
diff --git a/mate-panel/mate-panel-applets-manager.h b/mate-panel/panel-applets-manager.h
index 19132329..5ea82bf8 100644
--- a/mate-panel/mate-panel-applets-manager.h
+++ b/mate-panel/panel-applets-manager.h
@@ -1,5 +1,5 @@
 /*
- * mate-panel-applets-manager.h
+ * panel-applets-manager.h
  *
  * Copyright (C) 2010 Carlos Garcia Campos <[email protected]>
  * Copyright (C) 2010 Vincent Untz <[email protected]>
@@ -20,13 +20,13 @@
  * 02110-1301, USA.
  */
 
-#ifndef __MATE_PANEL_APPLETS_MANAGER_H__
-#define __MATE_PANEL_APPLETS_MANAGER_H__
+#ifndef __PANEL_APPLETS_MANAGER_H__
+#define __PANEL_APPLETS_MANAGER_H__
 
 #include <glib-object.h>
 
-#include "mate-panel-applet-frame.h"
-#include "mate-panel-applet-info.h"
+#include "panel-applet-frame.h"
+#include "panel-applet-info.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -91,4 +91,4 @@ gboolean          mate_panel_applets_manager_load_applet                 (const
 }
 #endif
 
-#endif /* __MATE_PANEL_APPLETS_MANAGER_H__ */
+#endif /* __PANEL_APPLETS_MANAGER_H__ */
diff --git a/mate-panel/panel-modules.c b/mate-panel/panel-modules.c
index a4182241..af26d634 100644
--- a/mate-panel/panel-modules.c
+++ b/mate-panel/panel-modules.c
@@ -23,13 +23,11 @@
  */
 
 #include <config.h>
-
 #include <gio/gio.h>
 
-#include <libmate-panel-applet-private/mate-panel-applets-manager-dbus.h>
-
-#include "mate-panel-applets-manager.h"
+#include <libmate-panel-applet-private/panel-applets-manager-dbus.h>
 
+#include "panel-applets-manager.h"
 #include "panel-modules.h"
 
 static void
diff --git a/mate-panel/panel-test-applets.c b/mate-panel/panel-test-applets.c
index aa83bbbe..ecdd784a 100644
--- a/mate-panel/panel-test-applets.c
+++ b/mate-panel/panel-test-applets.c
@@ -17,8 +17,8 @@
 #include <libpanel-util/panel-cleanup.h>
 #include <libmate-desktop/mate-dconf.h>
 
-#include <libmate-panel-applet-private/mate-panel-applet-container.h>
-#include <libmate-panel-applet-private/mate-panel-applets-manager-dbus.h>
+#include <libmate-panel-applet-private/panel-applet-container.h>
+#include <libmate-panel-applet-private/panel-applets-manager-dbus.h>
 
 #include "panel-modules.h"
 
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index c8e82442..79591ca5 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -24,7 +24,7 @@
 #include "panel-util.h"
 #include "panel-marshal.h"
 #include "panel-typebuiltins.h"
-#include "mate-panel-applet-frame.h"
+#include "panel-applet-frame.h"
 #include "panel-globals.h"
 #include "panel-profile.h"
 #include "panel-lockdown.h"
diff --git a/mate-panel/panel.c b/mate-panel/panel.c
index f0893774..6c29eda2 100644
--- a/mate-panel/panel.c
+++ b/mate-panel/panel.c
@@ -35,7 +35,7 @@
 #include "panel-util.h"
 #include "panel-config-global.h"
 #include "panel-profile.h"
-#include "mate-panel-applet-frame.h"
+#include "panel-applet-frame.h"
 #include "panel-action-button.h"
 #include "panel-menu-bar.h"
 #include "panel-separator.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 653d481b..dc79a790 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -47,7 +47,7 @@ mate-panel/menu.c
 mate-panel/nothing.cP
 mate-panel/panel-action-button.c
 mate-panel/panel-addto.c
-mate-panel/mate-panel-applet-frame.c
+mate-panel/panel-applet-frame.c
 mate-panel/panel-bindings.c
 mate-panel/panel-context-menu.c
 mate-panel/panel-ditem-editor.c