From 50c9ef3ffc739bdb6d0b437a495928ea57728550 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Thu, 7 Jun 2012 19:25:31 +0200 Subject: format-file related transcript widget methods return a GError which is used to display meaningful error messages * also cleaned up return value confusion: in GLib world, TRUE means successful --- .../gtk-experiment-transcript.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'lib/gtk-experiment-widgets/gtk-experiment-transcript.h') diff --git a/lib/gtk-experiment-widgets/gtk-experiment-transcript.h b/lib/gtk-experiment-widgets/gtk-experiment-transcript.h index 9d300b2..1657b0a 100644 --- a/lib/gtk-experiment-widgets/gtk-experiment-transcript.h +++ b/lib/gtk-experiment-widgets/gtk-experiment-transcript.h @@ -25,6 +25,7 @@ #define __GTK_EXPERIMENT_TRANSCRIPT_H #include +#include #include #include @@ -33,6 +34,17 @@ G_BEGIN_DECLS +/** \e GtkExperimentTranscript error domain */ +#define GTK_EXPERIMENT_TRANSCRIPT_ERROR \ + (gtk_experiment_transcript_error_quark()) + +/** \e GtkExperimentTranscript error codes */ +typedef enum { + GTK_EXPERIMENT_TRANSCRIPT_ERROR_FILEOPEN, /**< Error opening file */ + GTK_EXPERIMENT_TRANSCRIPT_ERROR_REGEXCAPTURES /**< Additional regular expression captures used */ +} GtkExperimentTranscriptError; + +/** \e GtkExperimentTranscript type */ #define GTK_TYPE_EXPERIMENT_TRANSCRIPT \ (gtk_experiment_transcript_get_type()) /** @@ -86,6 +98,8 @@ typedef struct _GtkExperimentTranscriptClass { GtkWidgetClass parent_class; /**< Parent class structure */ } GtkExperimentTranscriptClass; +/** @private */ +GQuark gtk_experiment_transcript_error_quark(void); /** @private */ GType gtk_experiment_transcript_get_type(void); @@ -104,10 +118,12 @@ void gtk_experiment_transcript_set_alignment(GtkExperimentTranscript *trans, PangoAlignment gtk_experiment_transcript_get_alignment(GtkExperimentTranscript *trans); gboolean gtk_experiment_transcript_load_formats(GtkExperimentTranscript *trans, - const gchar *filename); + const gchar *filename, + GError **error); gboolean gtk_experiment_transcript_set_interactive_format(GtkExperimentTranscript *trans, const gchar *format_str, - gboolean with_markup); + gboolean with_markup, + GError **error); GtkAdjustment *gtk_experiment_transcript_get_time_adjustment(GtkExperimentTranscript *trans); void gtk_experiment_transcript_set_time_adjustment(GtkExperimentTranscript *trans, -- cgit v1.2.3