diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-06-17 17:52:19 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-06-17 17:52:19 +0200 |
| commit | 5eb285cf1ce430dc46392e2335350858d4de6023 (patch) | |
| tree | 86f24ac710172d956b6d5da8c3a19f2bfe451e54 /lib/gtk-experiment-widgets | |
| parent | 6751167f52d9056d6ac9770323658f4904db3afd (diff) | |
| download | gtk-vlc-player-5eb285cf1ce430dc46392e2335350858d4de6023.tar.gz | |
use more glib macros to improve portability
Diffstat (limited to 'lib/gtk-experiment-widgets')
4 files changed, 16 insertions, 14 deletions
diff --git a/lib/gtk-experiment-widgets/gtk-experiment-navigator.c b/lib/gtk-experiment-widgets/gtk-experiment-navigator.c index 206384a..8f88414 100644 --- a/lib/gtk-experiment-widgets/gtk-experiment-navigator.c +++ b/lib/gtk-experiment-widgets/gtk-experiment-navigator.c @@ -63,12 +63,12 @@ static inline void activate_section(GtkExperimentNavigator *navi, * * @param VAR Variable to unreference */ -#define GOBJECT_UNREF_SAFE(VAR) do { \ - if ((VAR) != NULL) { \ - g_object_unref(VAR); \ - VAR = NULL; \ - } \ -} while (0) +#define GOBJECT_UNREF_SAFE(VAR) G_STMT_START { \ + if ((VAR) != NULL) { \ + g_object_unref(VAR); \ + VAR = NULL; \ + } \ +} G_STMT_END /** @private */ #define GTK_EXPERIMENT_NAVIGATOR_GET_PRIVATE(obj) \ diff --git a/lib/gtk-experiment-widgets/gtk-experiment-transcript-formats.c b/lib/gtk-experiment-widgets/gtk-experiment-transcript-formats.c index b14b770..cc2697c 100644 --- a/lib/gtk-experiment-widgets/gtk-experiment-transcript-formats.c +++ b/lib/gtk-experiment-widgets/gtk-experiment-transcript-formats.c @@ -105,7 +105,7 @@ gtk_experiment_transcript_parse_format(GtkExperimentTranscriptFormat *fmt, } /** @private */ -void +G_GNUC_INTERNAL void gtk_experiment_transcript_apply_format(GtkExperimentTranscriptFormat *fmt, const gchar *text, PangoAttrList *attrib_list) diff --git a/lib/gtk-experiment-widgets/gtk-experiment-transcript-private.h b/lib/gtk-experiment-widgets/gtk-experiment-transcript-private.h index 7d38c32..30fc3fc 100644 --- a/lib/gtk-experiment-widgets/gtk-experiment-transcript-private.h +++ b/lib/gtk-experiment-widgets/gtk-experiment-transcript-private.h @@ -102,17 +102,19 @@ typedef gboolean (*GtkExperimentTranscriptContribRenderer) * * @param VAR Variable to unreference */ -#define GOBJECT_UNREF_SAFE(VAR) do { \ - if ((VAR) != NULL) { \ - g_object_unref(VAR); \ - VAR = NULL; \ - } \ -} while (0) +#define GOBJECT_UNREF_SAFE(VAR) G_STMT_START { \ + if ((VAR) != NULL) { \ + g_object_unref(VAR); \ + VAR = NULL; \ + } \ +} G_STMT_END /** @private */ +G_GNUC_INTERNAL void gtk_experiment_transcript_text_layer_redraw(GtkExperimentTranscript *trans); /** @private */ +G_GNUC_INTERNAL void gtk_experiment_transcript_apply_format(GtkExperimentTranscriptFormat *fmt, const gchar *text, PangoAttrList *attrib_list); diff --git a/lib/gtk-experiment-widgets/gtk-experiment-transcript.c b/lib/gtk-experiment-widgets/gtk-experiment-transcript.c index 48b6d6e..7683a1e 100644 --- a/lib/gtk-experiment-widgets/gtk-experiment-transcript.c +++ b/lib/gtk-experiment-widgets/gtk-experiment-transcript.c @@ -575,7 +575,7 @@ render_backdrop_area(GtkExperimentTranscript *trans, gint64 current_time_px) } /** @private */ -void +G_GNUC_INTERNAL void gtk_experiment_transcript_text_layer_redraw(GtkExperimentTranscript *trans) { GtkWidget *widget = GTK_WIDGET(trans); |