#include <moofileview/*> instead of #include <mooutils/moofileview/*>

2006-04-16 11:40:46 -05:00 · 2006-04-16 11:40:46 -05:00 · 22cf474bb8
parent e3f0b9365f
commit 22cf474bb8
17 changed files with 36 additions and 39 deletions
--- a/moo/mooedit/mooeditwindow.c
+++ b/moo/mooedit/mooeditwindow.c
@ -19,15 +19,13 @@
 #include "mooedit/mooeditprefs.h"
 #include "mooedit/mooplugin.h"
 #include "mooutils/moonotebook.h"
-#include "mooutils/moofileview/moofileview.h"
-#include "mooutils/moofileview/moobookmarkmgr.h"
-#include "mooutils/moofileview/moofile.h"
 #include "mooutils/moostock.h"
 #include "mooutils/moomarshals.h"
 #include "mooutils/moomenuaction.h"
 #include "mooutils/mooutils-misc.h"
 #include "mooutils/moocompat.h"
 #include "mooutils/mooglade.h"
+#include "moofileview/moofilesystem.h"
 #if GTK_CHECK_VERSION(2,10,0)
 #include "mooedit/mootextprint.h"
 #endif
--- a/moo/mooedit/plugins/fileselector.c
+++ b/moo/mooedit/plugins/fileselector.c
@ -17,7 +17,7 @@

 #include "mooedit/plugins/moofileselector.h"
 #include "mooedit/mooplugin-macro.h"
-#include "mooutils/moofileview/moobookmarkmgr.h"
+#include "moofileview/moobookmarkmgr.h"
 #include "mooedit/plugins/mooeditplugins.h"
 #include "mooedit/plugins/moofileselector-glade.h"
 #include "mooedit/plugins/moofilechooser.h"
--- a/moo/mooedit/plugins/moofilechooser.h
+++ b/moo/mooedit/plugins/moofilechooser.h
@ -14,7 +14,7 @@
 #ifndef __MOO_FILE_CHOOSER_H__
 #define __MOO_FILE_CHOOSER_H__

-#include "mooutils/moofileview/moofileview.h"
+#include "moofileview/moofileview.h"
 #include <gtk/gtkdialog.h>

 G_BEGIN_DECLS
--- a/moo/mooedit/plugins/moofileselector.h
+++ b/moo/mooedit/plugins/moofileselector.h
@ -15,7 +15,7 @@
 #define __MOO_FILE_SELECTOR_H__

 #include "mooedit/mooeditwindow.h"
-#include "mooutils/moofileview/moofileview.h"
+#include "moofileview/moofileview.h"

 G_BEGIN_DECLS

--- a/moo/mooedit/plugins/moofind.c
+++ b/moo/mooedit/plugins/moofind.c
@ -22,7 +22,7 @@
 #include "mooedit/mooplugin-macro.h"
 #include "mooedit/plugins/moofind-glade.h"
 #include "mooedit/plugins/mooeditplugins.h"
-#include "mooutils/moofileview/moofileentry.h"
+#include "moofileview/moofileentry.h"
 #include "mooedit/moocmdview.h"
 #include "mooutils/moostock.h"
 #include "mooutils/mooglade.h"
--- a/moo/mooutils/moofileview/moobookmarkmgr.c
+++ b/moo/mooutils/moofileview/moobookmarkmgr.c
@ -11,9 +11,9 @@
 *   See COPYING file that comes with this distribution.
 */

-#include "mooutils/moofileview/moobookmarkmgr.h"
-#include "mooutils/moofileview/moobookmarkmgr-glade.h"
-#include "mooutils/moofileview/moofileentry.h"
+#include "moofileview/moobookmarkmgr.h"
+#include "moofileview/moobookmarkmgr-glade.h"
+#include "moofileview/moofileentry.h"
 #include "mooutils/mooglade.h"
 #include "mooutils/mooprefs.h"
 #include "mooutils/moocompat.h"
--- a/moo/mooutils/moofileview/moobookmarkview.c
+++ b/moo/mooutils/moofileview/moobookmarkview.c
@ -11,7 +11,7 @@
 *   See COPYING file that comes with this distribution.
 */

-#include "mooutils/moofileview/moobookmarkview.h"
+#include "moofileview/moobookmarkview.h"
 #include "mooutils/moomarshals.h"
 #include <gtk/gtk.h>
 #include <string.h>
--- a/moo/mooutils/moofileview/moobookmarkview.h
+++ b/moo/mooutils/moofileview/moobookmarkview.h
@ -14,7 +14,7 @@
 #ifndef __MOO_BOOKMARK_VIEW_H__
 #define __MOO_BOOKMARK_VIEW_H__

-#include <mooutils/moofileview/moobookmarkmgr.h>
+#include <moofileview/moobookmarkmgr.h>
 #include <gtk/gtktreeview.h>

 G_BEGIN_DECLS
--- a/moo/mooutils/moofileview/moofile.c
+++ b/moo/mooutils/moofileview/moofile.c
@ -22,8 +22,8 @@
 */

 #define MOO_FILE_SYSTEM_COMPILATION
-#include "mooutils/moofileview/moofilesystem.h"
-#include "mooutils/moofileview/symlink.h"
+#include "moofileview/moofilesystem.h"
+#include "moofileview/symlink.h"
 #include MOO_MARSHALS_H
 #include <string.h>
 #include <sys/types.h>
--- a/moo/mooutils/moofileview/moofileentry.h
+++ b/moo/mooutils/moofileview/moofileentry.h
@ -15,7 +15,7 @@
 #define __MOO_FILE_ENTRY_H__

 #include <mooutils/mooentry.h>
-#include <mooutils/moofileview/moofile.h>
+#include <moofileview/moofile.h>

 G_BEGIN_DECLS

--- a/moo/mooutils/moofileview/moofilesystem.h
+++ b/moo/mooutils/moofileview/moofilesystem.h
@ -20,7 +20,7 @@
 #ifndef __MOO_FILE_SYSTEM_H__
 #define __MOO_FILE_SYSTEM_H__

-#include <mooutils/moofileview/moofile.h>
+#include <moofileview/moofile.h>
 #include <gtk/gtkwidget.h>
 #ifdef MOO_FILE_SYSTEM_COMPILATION
 #include "mooutils/moofilewatch.h"
--- a/moo/mooutils/moofileview/moofileview-dialogs.c
+++ b/moo/mooutils/moofileview/moofileview-dialogs.c
@ -12,11 +12,11 @@
 */

 #define MOO_FILE_SYSTEM_COMPILATION
-#include "mooutils/moofileview/moofileview-dialogs.h"
-#include "mooutils/moofileview/moofilesystem.h"
-#include "mooutils/moofileview/moofileprops-glade.h"
-#include "mooutils/moofileview/moocreatefolder-glade.h"
-#include "mooutils/moofileview/moofileviewdrop-glade.h"
+#include "moofileview/moofileview-dialogs.h"
+#include "moofileview/moofilesystem.h"
+#include "moofileview/moofileprops-glade.h"
+#include "moofileview/moocreatefolder-glade.h"
+#include "moofileview/moofileviewdrop-glade.h"
 #include "mooutils/mooentry.h"
 #include "mooutils/mooutils-gobject.h"
 #include "mooutils/moodialogs.h"
--- a/moo/mooutils/moofileview/moofileview-dialogs.h
+++ b/moo/mooutils/moofileview/moofileview-dialogs.h
@ -14,7 +14,7 @@
 #ifndef __MOO_FILE_VIEW_DIALOGS_H__
 #define __MOO_FILE_VIEW_DIALOGS_H__

-#include "mooutils/moofileview/moofile.h"
+#include "moofileview/moofile.h"
 #include "mooutils/mooglade.h"
 #include <gtk/gtkdialog.h>

--- a/moo/mooutils/moofileview/moofileview.c
+++ b/moo/mooutils/moofileview/moofileview.c
@ -18,17 +18,17 @@
 #endif

 #define MOO_FILE_SYSTEM_COMPILATION
-#include "mooutils/moofileview/moofileview.h"
-#include "mooutils/moofileview/moofileview-dialogs.h"
-#include "mooutils/moofileview/moobookmarkmgr.h"
-#include "mooutils/moofileview/moofilesystem.h"
-#include "mooutils/moofileview/moofoldermodel.h"
-#include "mooutils/moofileview/moofileentry.h"
-#include "mooutils/moofileview/mooiconview.h"
-#include "mooutils/moofileview/moofileview-private.h"
-#include "mooutils/moofileview/moofileview-ui.h"
-#include "mooutils/moofileview/mootreeview.h"
-#include "mooutils/moofileview/moobookmarkview.h"
+#include "moofileview/moofileview.h"
+#include "moofileview/moofileview-dialogs.h"
+#include "moofileview/moobookmarkmgr.h"
+#include "moofileview/moofilesystem.h"
+#include "moofileview/moofoldermodel.h"
+#include "moofileview/moofileentry.h"
+#include "moofileview/mooiconview.h"
+#include "moofileview/moofileview-private.h"
+#include "moofileview/moofileview-ui.h"
+#include "moofileview/mootreeview.h"
+#include "moofileview/moobookmarkview.h"
 #include "mooutils/mooutils-gobject.h"
 #include "mooutils/mooutils-fs.h"
 #include "mooutils/mooutils-misc.h"
@ -496,8 +496,7 @@ static void moo_file_view_class_init (MooFileViewClass *klass)
 #ifndef __WIN32__
                                             g_get_home_dir (),
 #else
-#warning "Do something here"
-                                             NULL,
+                                             "C:\\",
 #endif
                                             G_PARAM_CONSTRUCT | G_PARAM_READWRITE));

--- a/moo/mooutils/moofileview/moofoldermodel.h
+++ b/moo/mooutils/moofileview/moofoldermodel.h
@ -14,7 +14,7 @@
 #ifndef __MOO_FOLDER_MODEL_H__
 #define __MOO_FOLDER_MODEL_H__

-#include <mooutils/moofileview/moofile.h>
+#include <moofileview/moofile.h>
 #include <gtk/gtktreemodelfilter.h>

 G_BEGIN_DECLS
--- a/moo/mooutils/moofileview/mootreeview.c
+++ b/moo/mooutils/moofileview/mootreeview.c
@ -11,8 +11,8 @@
 *   See COPYING file that comes with this distribution.
 */

-#include "mooutils/moofileview/mootreeview.h"
-#include MOO_MARSHALS_H
+#include "moofileview/mootreeview.h"
+#include "mooutils/moomarshals.h"
 #include "mooutils/mooutils-gobject.h"
 #include <gtk/gtk.h>

--- a/moo/mooutils/moofileview/mootreeview.h
+++ b/moo/mooutils/moofileview/mootreeview.h
@ -15,7 +15,7 @@
 #define __MOO_TREE_VIEW_H__

 #include <gtk/gtktreeview.h>
-#include "mooutils/moofileview/mooiconview.h"
+#include "moofileview/mooiconview.h"

 G_BEGIN_DECLS