Port to the use of GFile instead of URIs and merge gio document loader and saver
into document loader and saver
This commit is contained in:
@@ -20,23 +20,16 @@ typedef enum
|
||||
XED_WINDOW_STATE_SAVING_SESSION = 1 << 5
|
||||
} XedWindowState;
|
||||
|
||||
/*
|
||||
* Type checking and casting macros
|
||||
*/
|
||||
#define XED_TYPE_WINDOW (xed_window_get_type())
|
||||
#define XED_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XED_TYPE_WINDOW, XedWindow))
|
||||
#define XED_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), XED_TYPE_WINDOW, XedWindowClass))
|
||||
#define XED_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), XED_TYPE_WINDOW))
|
||||
#define XED_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_WINDOW))
|
||||
#define XED_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), XED_TYPE_WINDOW, XedWindowClass))
|
||||
#define XED_TYPE_WINDOW (xed_window_get_type())
|
||||
#define XED_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), XED_TYPE_WINDOW, XedWindow))
|
||||
#define XED_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), XED_TYPE_WINDOW, XedWindowClass))
|
||||
#define XED_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), XED_TYPE_WINDOW))
|
||||
#define XED_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XED_TYPE_WINDOW))
|
||||
#define XED_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), XED_TYPE_WINDOW, XedWindowClass))
|
||||
|
||||
/* Private structure type */
|
||||
typedef struct _XedWindowPrivate XedWindowPrivate;
|
||||
|
||||
/*
|
||||
* Main object structure
|
||||
*/
|
||||
typedef struct _XedWindow XedWindow;
|
||||
typedef struct _XedWindow XedWindow;
|
||||
typedef struct _XedWindowPrivate XedWindowPrivate;
|
||||
typedef struct _XedWindowClass XedWindowClass;
|
||||
|
||||
struct _XedWindow
|
||||
{
|
||||
@@ -46,11 +39,6 @@ struct _XedWindow
|
||||
XedWindowPrivate *priv;
|
||||
};
|
||||
|
||||
/*
|
||||
* Class definition
|
||||
*/
|
||||
typedef struct _XedWindowClass XedWindowClass;
|
||||
|
||||
struct _XedWindowClass
|
||||
{
|
||||
GtkWindowClass parent_class;
|
||||
@@ -68,7 +56,7 @@ struct _XedWindowClass
|
||||
*/
|
||||
GType xed_window_get_type (void) G_GNUC_CONST;
|
||||
XedTab *xed_window_create_tab (XedWindow *window, gboolean jump_to);
|
||||
XedTab *xed_window_create_tab_from_uri (XedWindow *window, const gchar *uri, const XedEncoding *encoding,
|
||||
XedTab *xed_window_create_tab_from_location (XedWindow *window, GFile *location, const XedEncoding *encoding,
|
||||
gint line_pos, gboolean create, gboolean jump_to);
|
||||
void xed_window_close_tab (XedWindow *window, XedTab *tab);
|
||||
void xed_window_close_all_tabs (XedWindow *window);
|
||||
@@ -115,8 +103,8 @@ void _xed_window_unfullscreen (XedWindow *window);
|
||||
gboolean _xed_window_is_fullscreen (XedWindow *window);
|
||||
|
||||
/* these are in xed-window because of screen safety */
|
||||
void _xed_recent_add (XedWindow *window, const gchar *uri, const gchar *mime);
|
||||
void _xed_recent_remove (XedWindow *window, const gchar *uri);
|
||||
void _xed_recent_add (XedWindow *window, GFile *location, const gchar *mime);
|
||||
void _xed_recent_remove (XedWindow *window, GFile *location);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
Reference in New Issue
Block a user