[nautilus] window: remove nautilus-window-types.h
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] window: remove nautilus-window-types.h
- Date: Fri, 26 Oct 2012 18:56:31 +0000 (UTC)
commit 8e44eafda460b5d7e3553e1889204ece02101924
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Fri Oct 26 14:21:45 2012 -0400
window: remove nautilus-window-types.h
Cleanup and rearrange typedefs to avoid the need for a separate types
header.
src/Makefile.am | 1 -
src/nautilus-notebook.h | 9 ++++---
src/nautilus-window-slot.h | 11 ++++++---
src/nautilus-window-types.h | 49 -------------------------------------------
src/nautilus-window.h | 42 +++++++++++++++++++-----------------
5 files changed, 34 insertions(+), 78 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index eddc7f0..245b326 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -203,7 +203,6 @@ nautilus_SOURCES = \
nautilus-window-slot-dnd.h \
nautilus-window.c \
nautilus-window.h \
- nautilus-window-types.h \
nautilus-x-content-bar.c \
nautilus-x-content-bar.h \
$(NULL)
diff --git a/src/nautilus-notebook.h b/src/nautilus-notebook.h
index 7dd145a..b11abaa 100644
--- a/src/nautilus-notebook.h
+++ b/src/nautilus-notebook.h
@@ -29,6 +29,11 @@
#include <glib.h>
#include <gtk/gtk.h>
+
+typedef struct _NautilusNotebookClass NautilusNotebookClass;
+typedef struct _NautilusNotebook NautilusNotebook;
+typedef struct _NautilusNotebookPrivate NautilusNotebookPrivate;
+
#include "nautilus-window-slot.h"
G_BEGIN_DECLS
@@ -40,10 +45,6 @@ G_BEGIN_DECLS
#define NAUTILUS_IS_NOTEBOOK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_NOTEBOOK))
#define NAUTILUS_NOTEBOOK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_NOTEBOOK, NautilusNotebookClass))
-typedef struct _NautilusNotebookClass NautilusNotebookClass;
-typedef struct _NautilusNotebook NautilusNotebook;
-typedef struct _NautilusNotebookPrivate NautilusNotebookPrivate;
-
struct _NautilusNotebook
{
GtkNotebook parent;
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index 47abbc9..48508af 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -25,10 +25,15 @@
#ifndef NAUTILUS_WINDOW_SLOT_H
#define NAUTILUS_WINDOW_SLOT_H
-#include "nautilus-view.h"
-#include "nautilus-window-types.h"
#include "nautilus-query-editor.h"
+typedef struct NautilusWindowSlot NautilusWindowSlot;
+typedef struct NautilusWindowSlotClass NautilusWindowSlotClass;
+typedef struct NautilusWindowSlotDetails NautilusWindowSlotDetails;
+
+#include "nautilus-view.h"
+#include "nautilus-window.h"
+
#define NAUTILUS_TYPE_WINDOW_SLOT (nautilus_window_slot_get_type())
#define NAUTILUS_WINDOW_SLOT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_WINDOW_SLOT, NautilusWindowSlotClass))
#define NAUTILUS_WINDOW_SLOT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_WINDOW_SLOT, NautilusWindowSlot))
@@ -51,8 +56,6 @@ struct NautilusWindowSlotClass {
void (* inactive) (NautilusWindowSlot *slot);
};
-typedef struct NautilusWindowSlotDetails NautilusWindowSlotDetails;
-
/* Each NautilusWindowSlot corresponds to a location in the window
* for displaying a NautilusView, i.e. a tab.
*/
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 6bcf477..3dc343f 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -34,8 +34,27 @@
#include <libnautilus-private/nautilus-bookmark.h>
#include <libnautilus-private/nautilus-search-directory.h>
+typedef struct NautilusWindow NautilusWindow;
+typedef struct NautilusWindowClass NautilusWindowClass;
+typedef struct NautilusWindowDetails NautilusWindowDetails;
+
+typedef enum {
+ NAUTILUS_WINDOW_OPEN_FLAG_CLOSE_BEHIND = 1 << 0,
+ NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW = 1 << 1,
+ NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB = 1 << 2
+} NautilusWindowOpenFlags;
+
+typedef enum {
+ NAUTILUS_WINDOW_OPEN_SLOT_NONE = 0,
+ NAUTILUS_WINDOW_OPEN_SLOT_APPEND = 1
+} NautilusWindowOpenSlotFlags;
+
+typedef gboolean (* NautilusWindowGoToCallback) (NautilusWindow *window,
+ GError *error,
+ gpointer user_data);
+
#include "nautilus-view.h"
-#include "nautilus-window-types.h"
+#include "nautilus-window-slot.h"
#define NAUTILUS_TYPE_WINDOW nautilus_window_get_type()
#define NAUTILUS_WINDOW(obj) \
@@ -49,34 +68,17 @@
#define NAUTILUS_WINDOW_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_WINDOW, NautilusWindowClass))
-typedef enum {
- NAUTILUS_WINDOW_NOT_SHOWN,
- NAUTILUS_WINDOW_POSITION_SET,
- NAUTILUS_WINDOW_SHOULD_SHOW
-} NautilusWindowShowState;
-
-typedef enum {
- NAUTILUS_WINDOW_OPEN_SLOT_NONE = 0,
- NAUTILUS_WINDOW_OPEN_SLOT_APPEND = 1
-} NautilusWindowOpenSlotFlags;
-
#define NAUTILUS_WINDOW_SIDEBAR_PLACES "places"
#define NAUTILUS_WINDOW_SIDEBAR_TREE "tree"
-typedef struct NautilusWindowDetails NautilusWindowDetails;
-
-typedef struct {
+struct NautilusWindowClass {
GtkApplicationWindowClass parent_spot;
/* Function pointers for overriding, without corresponding signals */
-
void (* sync_title) (NautilusWindow *window,
NautilusWindowSlot *slot);
- NautilusIconInfo * (* get_icon) (NautilusWindow *window,
- NautilusWindowSlot *slot);
-
void (* close) (NautilusWindow *window);
-} NautilusWindowClass;
+};
struct NautilusWindow {
GtkApplicationWindow parent_object;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]