[Xfce4-commits] [apps/xfce4-terminal] 01/01: Do not declare or define a reserved identifier part 2
noreply at xfce.org
noreply at xfce.org
Wed Aug 3 12:30:59 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 b5b88b7b0d5fb10b821d2ef204416a9d7365640e
Author: Igor <f2404 at yandex.ru>
Date: Wed Aug 3 13:30:52 2016 +0300
Do not declare or define a reserved identifier part 2
---
terminal/terminal-app.c | 48 ++++++++++++++++----------------
terminal/terminal-encoding-action.c | 15 +++++-----
terminal/terminal-image-loader.c | 48 ++++++++++++++++----------------
terminal/terminal-preferences-dialog.c | 4 +--
terminal/terminal-preferences.c | 19 ++++++++-----
terminal/terminal-preferences.h | 5 ----
terminal/terminal-screen.c | 4 +--
terminal/terminal-search-dialog.c | 4 +--
terminal/terminal-widget.c | 38 +++++++++++++-------------
terminal/terminal-window-dropdown.c | 50 +++++++++++++++++-----------------
terminal/terminal-window.h | 26 +++++++++---------
11 files changed, 130 insertions(+), 131 deletions(-)
diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 958de1d..6985892 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -53,39 +53,39 @@
-static void terminal_app_finalize (GObject *object);
-static void terminal_app_update_accels (TerminalApp *app);
-static void terminal_app_update_mnemonics (TerminalApp *app);
-static gboolean terminal_app_accel_map_load (gpointer user_data);
-static gboolean terminal_app_accel_map_save (gpointer user_data);
-static void terminal_app_unset_urgent_bell (TerminalWindow *window,
- GdkEvent *event,
- TerminalApp *app);
-static void terminal_app_new_window (TerminalWindow *window,
- const gchar *working_directory,
- TerminalApp *app);
-static void terminal_app_new_window_with_terminal (TerminalWindow *window,
- TerminalScreen *terminal,
- gint x,
- gint y,
- TerminalApp *app);
-static void terminal_app_window_destroyed (GtkWidget *window,
- TerminalApp *app);
-static void terminal_app_save_yourself (XfceSMClient *client,
- TerminalApp *app);
-static void terminal_app_open_window (TerminalApp *app,
- TerminalWindowAttr *attr);
+static void terminal_app_finalize (GObject *object);
+static void terminal_app_update_accels (TerminalApp *app);
+static void terminal_app_update_mnemonics (TerminalApp *app);
+static gboolean terminal_app_accel_map_load (gpointer user_data);
+static gboolean terminal_app_accel_map_save (gpointer user_data);
+static void terminal_app_unset_urgent_bell (TerminalWindow *window,
+ GdkEvent *event,
+ TerminalApp *app);
+static void terminal_app_new_window (TerminalWindow *window,
+ const gchar *working_directory,
+ TerminalApp *app);
+static void terminal_app_new_window_with_terminal (TerminalWindow *window,
+ TerminalScreen *terminal,
+ gint x,
+ gint y,
+ TerminalApp *app);
+static void terminal_app_window_destroyed (GtkWidget *window,
+ TerminalApp *app);
+static void terminal_app_save_yourself (XfceSMClient *client,
+ TerminalApp *app);
+static void terminal_app_open_window (TerminalApp *app,
+ TerminalWindowAttr *attr);
struct _TerminalAppClass
{
- GObjectClass __parent__;
+ GObjectClass parent_class;
};
struct _TerminalApp
{
- GObject __parent__;
+ GObject parent_instance;
TerminalPreferences *preferences;
XfceSMClient *session_client;
gchar *initial_menu_bar_accel;
diff --git a/terminal/terminal-encoding-action.c b/terminal/terminal-encoding-action.c
index d08b48c..fa2bc69 100644
--- a/terminal/terminal-encoding-action.c
+++ b/terminal/terminal-encoding-action.c
@@ -43,23 +43,22 @@ enum
-static void terminal_encoding_action_finalize (GObject *object);
-static GtkWidget *terminal_encoding_action_create_menu_item (GtkAction *action);
-static void terminal_encoding_action_menu_shown (GtkWidget *menu,
- TerminalEncodingAction *encoding_action);
+static void terminal_encoding_action_finalize (GObject *object);
+static GtkWidget *terminal_encoding_action_create_menu_item (GtkAction *action);
+static void terminal_encoding_action_menu_shown (GtkWidget *menu,
+ TerminalEncodingAction *encoding_action);
struct _TerminalEncodingActionClass
{
- GtkActionClass __parent__;
+ GtkActionClass parent_class;
};
struct _TerminalEncodingAction
{
- GtkAction __parent__;
-
- gchar *current;
+ GtkAction parent_instance;
+ gchar *current;
};
diff --git a/terminal/terminal-image-loader.c b/terminal/terminal-image-loader.c
index cf7db88..f03d4bd 100644
--- a/terminal/terminal-image-loader.c
+++ b/terminal/terminal-image-loader.c
@@ -27,38 +27,38 @@
-static void terminal_image_loader_finalize (GObject *object);
-static void terminal_image_loader_check (TerminalImageLoader *loader);
-static void terminal_image_loader_pixbuf_destroyed (gpointer data,
- GObject *pixbuf);
-static void terminal_image_loader_tile (TerminalImageLoader *loader,
- GdkPixbuf *target,
- gint width,
- gint height);
-static void terminal_image_loader_center (TerminalImageLoader *loader,
- GdkPixbuf *target,
- gint width,
- gint height);
-static void terminal_image_loader_scale (TerminalImageLoader *loader,
- GdkPixbuf *target,
- gint width,
- gint height);
-static void terminal_image_loader_stretch (TerminalImageLoader *loader,
- GdkPixbuf *target,
- gint width,
- gint height);
-static void terminal_image_loader_saturate (TerminalImageLoader *loader,
- GdkPixbuf *pixbuf);
+static void terminal_image_loader_finalize (GObject *object);
+static void terminal_image_loader_check (TerminalImageLoader *loader);
+static void terminal_image_loader_pixbuf_destroyed (gpointer data,
+ GObject *pixbuf);
+static void terminal_image_loader_tile (TerminalImageLoader *loader,
+ GdkPixbuf *target,
+ gint width,
+ gint height);
+static void terminal_image_loader_center (TerminalImageLoader *loader,
+ GdkPixbuf *target,
+ gint width,
+ gint height);
+static void terminal_image_loader_scale (TerminalImageLoader *loader,
+ GdkPixbuf *target,
+ gint width,
+ gint height);
+static void terminal_image_loader_stretch (TerminalImageLoader *loader,
+ GdkPixbuf *target,
+ gint width,
+ gint height);
+static void terminal_image_loader_saturate (TerminalImageLoader *loader,
+ GdkPixbuf *pixbuf);
struct _TerminalImageLoaderClass
{
- GObjectClass __parent__;
+ GObjectClass parent_class;
};
struct _TerminalImageLoader
{
- GObject __parent__;
+ GObject parent_instance;
TerminalPreferences *preferences;
/* the cached image data */
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index e766274..b88b59b 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -71,12 +71,12 @@ static void terminal_preferences_dialog_scroll_unlimited (GtkWidget
struct _TerminalPreferencesDialogClass
{
- GtkBuilderClass __parent__;
+ GtkBuilderClass parent_class;
};
struct _TerminalPreferencesDialog
{
- GtkBuilder __parent__;
+ GtkBuilder parent_instance;
TerminalPreferences *preferences;
GSList *bindings;
diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c
index dbd6ebf..14d8c7d 100644
--- a/terminal/terminal-preferences.c
+++ b/terminal/terminal-preferences.c
@@ -109,18 +109,23 @@ enum
N_PROPERTIES,
};
+struct _TerminalPreferencesClass
+{
+ GObjectClass parent_class;
+};
+
struct _TerminalPreferences
{
- GObject __parent__;
+ GObject parent_instance;
- GValue values[N_PROPERTIES];
+ GValue values[N_PROPERTIES];
- GFile *file;
- GFileMonitor *monitor;
- guint32 last_mtime;
+ GFile *file;
+ GFileMonitor *monitor;
+ guint64 last_mtime;
- guint store_idle_id;
- guint loading_in_progress : 1;
+ guint store_idle_id;
+ guint loading_in_progress : 1;
};
diff --git a/terminal/terminal-preferences.h b/terminal/terminal-preferences.h
index 268f548..6c9577c 100644
--- a/terminal/terminal-preferences.h
+++ b/terminal/terminal-preferences.h
@@ -81,11 +81,6 @@ typedef enum /*< enum,prefix=TERMINAL_CURSOR_SHAPE >*/
TERMINAL_CURSOR_SHAPE_UNDERLINE
} TerminalCursorShape;
-struct _TerminalPreferencesClass
-{
- GObjectClass __parent__;
-};
-
GType terminal_preferences_get_type (void) G_GNUC_CONST;
TerminalPreferences *terminal_preferences_get (void);
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index b693dcf..d033b5d 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -151,12 +151,12 @@ static void terminal_screen_urgent_bell (TerminalWidget
struct _TerminalScreenClass
{
- GtkHBoxClass __parent__;
+ GtkHBoxClass parent_class;
};
struct _TerminalScreen
{
- GtkHBox __parent__;
+ GtkHBox parent_instance;
TerminalPreferences *preferences;
GtkWidget *terminal;
GtkWidget *scrollbar;
diff --git a/terminal/terminal-search-dialog.c b/terminal/terminal-search-dialog.c
index b45ddb8..eb056ef 100644
--- a/terminal/terminal-search-dialog.c
+++ b/terminal/terminal-search-dialog.c
@@ -43,12 +43,12 @@ static void terminal_search_dialog_entry_changed (GtkWidget *ent
struct _TerminalSearchDialogClass
{
- GtkDialogClass __parent__;
+ GtkDialogClass parent_class;
};
struct _TerminalSearchDialog
{
- GtkDialog __parent__;
+ GtkDialog parent_instance;
GRegex *last_gregex;
diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c
index e4cd713..89ca2ff 100644
--- a/terminal/terminal-widget.c
+++ b/terminal/terminal-widget.c
@@ -87,36 +87,36 @@ static const TerminalRegexPattern regex_patterns[] =
-static void terminal_widget_finalize (GObject *object);
-static gboolean terminal_widget_button_press_event (GtkWidget *widget,
- GdkEventButton *event);
-static void terminal_widget_drag_data_received (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *selection_data,
- guint info,
- guint time);
-static gboolean terminal_widget_key_press_event (GtkWidget *widget,
- GdkEventKey *event);
-static void terminal_widget_open_uri (TerminalWidget *widget,
- const gchar *link,
- gint tag);
-static void terminal_widget_update_highlight_urls (TerminalWidget *widget);
+static void terminal_widget_finalize (GObject *object);
+static gboolean terminal_widget_button_press_event (GtkWidget *widget,
+ GdkEventButton *event);
+static void terminal_widget_drag_data_received (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time);
+static gboolean terminal_widget_key_press_event (GtkWidget *widget,
+ GdkEventKey *event);
+static void terminal_widget_open_uri (TerminalWidget *widget,
+ const gchar *link,
+ gint tag);
+static void terminal_widget_update_highlight_urls (TerminalWidget *widget);
struct _TerminalWidgetClass
{
- VteTerminalClass __parent__;
+ VteTerminalClass parent_class;
/* signals */
- GtkWidget* (*get_context_menu) (TerminalWidget *widget);
+ GtkWidget* (*get_context_menu) (TerminalWidget *widget);
};
struct _TerminalWidget
{
- VteTerminal __parent__;
+ VteTerminal parent_instance;
/*< private >*/
TerminalPreferences *preferences;
diff --git a/terminal/terminal-window-dropdown.c b/terminal/terminal-window-dropdown.c
index c3141bd..236eefb 100644
--- a/terminal/terminal-window-dropdown.c
+++ b/terminal/terminal-window-dropdown.c
@@ -61,34 +61,34 @@ enum
-static void terminal_window_dropdown_finalize (GObject *object);
-static void terminal_window_dropdown_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static gboolean terminal_window_dropdown_focus_in_event (GtkWidget *widget,
- GdkEventFocus *event);
-static gboolean terminal_window_dropdown_focus_out_event (GtkWidget *widget,
- GdkEventFocus *event);
-static gboolean terminal_window_dropdown_status_icon_press_event (GtkStatusIcon *status_icon,
- GdkEventButton *event,
- TerminalWindowDropdown *dropdown);
-static void terminal_window_dropdown_status_icon_popup_menu (GtkStatusIcon *status_icon,
- guint button,
- guint32 timestamp,
- TerminalWindowDropdown *dropdown);
-static void terminal_window_dropdown_hide (TerminalWindowDropdown *dropdown);
-static void terminal_window_dropdown_show (TerminalWindowDropdown *dropdown,
- guint32 timestamp);
-static void terminal_window_dropdown_toggle_real (TerminalWindowDropdown *dropdown,
- guint32 timestamp,
- gboolean force_show);
-static void terminal_window_dropdown_update_geometry (TerminalWindowDropdown *dropdown);
+static void terminal_window_dropdown_finalize (GObject *object);
+static void terminal_window_dropdown_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static gboolean terminal_window_dropdown_focus_in_event (GtkWidget *widget,
+ GdkEventFocus *event);
+static gboolean terminal_window_dropdown_focus_out_event (GtkWidget *widget,
+ GdkEventFocus *event);
+static gboolean terminal_window_dropdown_status_icon_press_event (GtkStatusIcon *status_icon,
+ GdkEventButton *event,
+ TerminalWindowDropdown *dropdown);
+static void terminal_window_dropdown_status_icon_popup_menu (GtkStatusIcon *status_icon,
+ guint button,
+ guint32 timestamp,
+ TerminalWindowDropdown *dropdown);
+static void terminal_window_dropdown_hide (TerminalWindowDropdown *dropdown);
+static void terminal_window_dropdown_show (TerminalWindowDropdown *dropdown,
+ guint32 timestamp);
+static void terminal_window_dropdown_toggle_real (TerminalWindowDropdown *dropdown,
+ guint32 timestamp,
+ gboolean force_show);
+static void terminal_window_dropdown_update_geometry (TerminalWindowDropdown *dropdown);
struct _TerminalWindowDropdownClass
{
- TerminalWindowClass __parent__;
+ TerminalWindowClass parent_class;
};
typedef enum
@@ -100,7 +100,7 @@ typedef enum
struct _TerminalWindowDropdown
{
- TerminalWindow __parent__;
+ TerminalWindow parent_instance;
/* viewport for animation */
GtkWidget *viewport;
diff --git a/terminal/terminal-window.h b/terminal/terminal-window.h
index a84cc9d..b71ec2c 100644
--- a/terminal/terminal-window.h
+++ b/terminal/terminal-window.h
@@ -35,12 +35,12 @@ G_BEGIN_DECLS
typedef struct
{
- GtkWindowClass __parent__;
+ GtkWindowClass parent_class;
} TerminalWindowClass;
typedef struct
{
- GtkWindow __parent__;
+ GtkWindow parent_instance;
/* if this is a TerminalWindowDropdown */
guint drop_down : 1;
@@ -89,22 +89,22 @@ typedef struct
GtkAction *action_fullscreen;
} TerminalWindow;
-GType terminal_window_get_type (void) G_GNUC_CONST;
+GType terminal_window_get_type (void) G_GNUC_CONST;
-GtkWidget *terminal_window_new (const gchar *role,
- gboolean fullscreen,
- TerminalVisibility menubar,
- TerminalVisibility borders,
- TerminalVisibility toolbar);
+GtkWidget *terminal_window_new (const gchar *role,
+ gboolean fullscreen,
+ TerminalVisibility menubar,
+ TerminalVisibility borders,
+ TerminalVisibility toolbar);
-void terminal_window_add (TerminalWindow *window,
- TerminalScreen *screen);
+void terminal_window_add (TerminalWindow *window,
+ TerminalScreen *screen);
-TerminalScreen *terminal_window_get_active (TerminalWindow *window);
+TerminalScreen *terminal_window_get_active (TerminalWindow *window);
-void terminal_window_notebook_show_tabs (TerminalWindow *window);
+void terminal_window_notebook_show_tabs (TerminalWindow *window);
-GSList *terminal_window_get_restart_command (TerminalWindow *window);
+GSList *terminal_window_get_restart_command (TerminalWindow *window);
G_END_DECLS
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list