[Xfce4-commits] <xfce4-panel:devel> Rename the 4.6 migration file.

Nick Schermer noreply at xfce.org
Wed Oct 28 16:20:02 CET 2009


Updating branch refs/heads/devel
         to 807a26297a234fa4ced77fc3ffddb035f1061c27 (commit)
       from 8c4e1f2836fce7fa981c205a67f124e449730eed (commit)

commit 807a26297a234fa4ced77fc3ffddb035f1061c27
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Oct 27 20:36:30 2009 +0100

    Rename the 4.6 migration file.

 migrate/Makefile.am                    |    4 ++--
 migrate/main.c                         |    2 +-
 migrate/{migrate_46.c => migrate-46.c} |    2 +-
 migrate/{migrate_46.h => migrate-46.h} |    6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/migrate/Makefile.am b/migrate/Makefile.am
index 88e0f81..bb55302 100644
--- a/migrate/Makefile.am
+++ b/migrate/Makefile.am
@@ -15,8 +15,8 @@ libexec_PROGRAMS = \
 
 xfce4_panel_migrate_SOURCES = \
 	main.c \
-	migrate_46.c \
-	migrate_46.h
+	migrate-46.c \
+	migrate-46.h
 
 xfce4_panel_migrate_CFLAGS = \
 	$(GTK_CFLAGS) \
diff --git a/migrate/main.c b/migrate/main.c
index a9fe655..a61d32b 100644
--- a/migrate/main.c
+++ b/migrate/main.c
@@ -34,7 +34,7 @@
 #include <xfconf/xfconf.h>
 #include <libxfce4util/libxfce4util.h>
 
-#include <migrate/migrate_46.h>
+#include <migrate/migrate-46.h>
 
 
 
diff --git a/migrate/migrate_46.c b/migrate/migrate-46.c
similarity index 99%
rename from migrate/migrate_46.c
rename to migrate/migrate-46.c
index cb77d76..84c1cc8 100644
--- a/migrate/migrate_46.c
+++ b/migrate/migrate-46.c
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 #include <xfconf/xfconf.h>
 #include <libxfce4util/libxfce4util.h>
-#include <migrate/migrate_46.h>
+#include <migrate/migrate-46.h>
 
 
 typedef enum
diff --git a/migrate/migrate_46.h b/migrate/migrate-46.h
similarity index 92%
rename from migrate/migrate_46.h
rename to migrate/migrate-46.h
index 81d8df7..77ccabd 100644
--- a/migrate/migrate_46.h
+++ b/migrate/migrate-46.h
@@ -16,8 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __XFCE_46_PARSER_H__
-#define __XFCE_46_PARSER_H__
+#ifndef __MIGRATE_46_H__
+#define __MIGRATE_46_H__
 
 #include <gtk/gtk.h>
 #include <xfconf/xfconf.h>
@@ -32,5 +32,5 @@ gboolean migrate_46 (const gchar *filename, XfconfChannel *channel, GError **err
 
 G_END_DECLS
 
-#endif /* !__XFCE_46_PARSER_H__ */
+#endif /* !__MIGRATE_46_H__ */
 



More information about the Xfce4-commits mailing list