[Xfce4-commits] [apps/xfce4-terminal] 01/01: Prevent internal (starting with _) types from being exported globally
noreply at xfce.org
noreply at xfce.org
Wed Jul 27 12:44:02 CEST 2016
This is an automated email from the git hooks/post-receive script.
f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.
commit 5882981d2b9d069e63bdd298e4c2701aa3d56fb7
Author: Igor <f2404 at yandex.ru>
Date: Wed Jul 27 13:43:56 2016 +0300
Prevent internal (starting with _) types from being exported globally
---
terminal/terminal-app.h | 5 ++---
terminal/terminal-options.h | 21 ++++++++-------------
terminal/terminal-window.h | 11 ++++-------
3 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/terminal/terminal-app.h b/terminal/terminal-app.h
index 0cef6db..23f2b5f 100644
--- a/terminal/terminal-app.h
+++ b/terminal/terminal-app.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
#define TERMINAL_ERROR (terminal_error_quark ())
GQuark terminal_error_quark (void) G_GNUC_CONST;
-enum _TerminalError
+typedef enum
{
/* problem with the runtime linker */
TERMINAL_ERROR_LINKER_FAILURE,
@@ -42,7 +42,7 @@ enum _TerminalError
TERMINAL_ERROR_OPTIONS,
/* general failure */
TERMINAL_ERROR_FAILED,
-};
+} TerminalError;
#define TERMINAL_TYPE_APP (terminal_app_get_type ())
@@ -52,7 +52,6 @@ enum _TerminalError
typedef struct _TerminalAppClass TerminalAppClass;
typedef struct _TerminalApp TerminalApp;
-typedef enum _TerminalError TerminalError;
GType terminal_app_get_type (void) G_GNUC_CONST;
diff --git a/terminal/terminal-options.h b/terminal/terminal-options.h
index e0230d9..2462cc8 100644
--- a/terminal/terminal-options.h
+++ b/terminal/terminal-options.h
@@ -24,19 +24,14 @@
G_BEGIN_DECLS
-typedef struct _TerminalTabAttr TerminalTabAttr;
-typedef struct _TerminalWindowAttr TerminalWindowAttr;
-typedef enum _TerminalVisibility TerminalVisibility;
-typedef enum _TerminalZoomLevel TerminalZoomLevel;
-
-enum _TerminalVisibility
+typedef enum
{
TERMINAL_VISIBILITY_DEFAULT,
TERMINAL_VISIBILITY_SHOW,
TERMINAL_VISIBILITY_HIDE
-};
+} TerminalVisibility;
-enum _TerminalZoomLevel
+typedef enum
{
TERMINAL_ZOOM_LEVEL_MINIMUM = -7,
TERMINAL_ZOOM_LEVEL_XXXXX_SMALL = -6,
@@ -54,17 +49,17 @@ enum _TerminalZoomLevel
TERMINAL_ZOOM_LEVEL_XXXXX_LARGE = +6,
TERMINAL_ZOOM_LEVEL_MAXIMUM = +7,
TERMINAL_ZOOM_LEVEL_DEFAULT = TERMINAL_ZOOM_LEVEL_MEDIUM
-};
+} TerminalZoomLevel;
-struct _TerminalTabAttr
+typedef struct
{
gchar **command;
gchar *directory;
gchar *title;
guint hold : 1;
-};
+} TerminalTabAttr;
-struct _TerminalWindowAttr
+typedef struct
{
GSList *tabs;
guint drop_down : 1;
@@ -82,7 +77,7 @@ struct _TerminalWindowAttr
TerminalZoomLevel zoom;
guint maximize : 1;
guint reuse_last_window : 1;
-};
+} TerminalWindowAttr;
void terminal_options_parse (gint argc,
gchar **argv,
diff --git a/terminal/terminal-window.h b/terminal/terminal-window.h
index dcf8507..1750517 100644
--- a/terminal/terminal-window.h
+++ b/terminal/terminal-window.h
@@ -33,15 +33,12 @@ G_BEGIN_DECLS
#define TERMINAL_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TERMINAL_TYPE_WINDOW))
#define TERMINAL_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TERMINAL_TYPE_WINDOW, TerminalWindowClass))
-typedef struct _TerminalWindowClass TerminalWindowClass;
-typedef struct _TerminalWindow TerminalWindow;
-
-struct _TerminalWindowClass
+typedef struct _TerminalWindowClass
{
GtkWindowClass __parent__;
-};
+} TerminalWindowClass;
-struct _TerminalWindow
+typedef struct
{
GtkWindow __parent__;
@@ -90,7 +87,7 @@ struct _TerminalWindow
GtkAction *action_search_next;
GtkAction *action_search_prev;
GtkAction *action_fullscreen;
-};
+} TerminalWindow;
GType terminal_window_get_type (void) G_GNUC_CONST;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list