diff options
| -rw-r--r-- | lib/gtk-experiment-widgets/gtk-experiment-navigator.c | 6 | ||||
| -rw-r--r-- | lib/gtk-experiment-widgets/gtk-experiment-transcript.c | 8 | ||||
| -rw-r--r-- | lib/gtk-vlc-player/gtk-vlc-player.c | 12 | ||||
| -rw-r--r-- | src/main.c | 26 | ||||
| -rw-r--r-- | src/quick-open.c | 4 |
5 files changed, 28 insertions, 28 deletions
diff --git a/lib/gtk-experiment-widgets/gtk-experiment-navigator.c b/lib/gtk-experiment-widgets/gtk-experiment-navigator.c index 65c3093..534b2cf 100644 --- a/lib/gtk-experiment-widgets/gtk-experiment-navigator.c +++ b/lib/gtk-experiment-widgets/gtk-experiment-navigator.c @@ -365,7 +365,7 @@ gtk_experiment_navigator_new(void) * * @param navi Object instance to display the structure in * @param exp \e ExperimentReader instance of opened XML-file - * @return \c TRUE on error, else \c FALSE + * @return \c TRUE on success, else \c FALSE */ gboolean gtk_experiment_navigator_load(GtkExperimentNavigator *navi, @@ -374,7 +374,7 @@ gtk_experiment_navigator_load(GtkExperimentNavigator *navi, /** @todo Clear contents */ /** @todo Process XML file and fill \e TreeViewStore */ - return FALSE; + return TRUE; } /** @@ -387,7 +387,7 @@ gtk_experiment_navigator_load(GtkExperimentNavigator *navi, * * @param navi Object instance to display the structure in * @param exp Filename of XML-file to open and use for configuring \e navi - * @return \c TRUE on error, else \c FALSE + * @return \c TRUE on success, else \c FALSE */ gboolean gtk_experiment_navigator_load_filename(GtkExperimentNavigator *navi, diff --git a/lib/gtk-experiment-widgets/gtk-experiment-transcript.c b/lib/gtk-experiment-widgets/gtk-experiment-transcript.c index b014dec..05a627e 100644 --- a/lib/gtk-experiment-widgets/gtk-experiment-transcript.c +++ b/lib/gtk-experiment-widgets/gtk-experiment-transcript.c @@ -692,7 +692,7 @@ gtk_experiment_transcript_new(const gchar *speaker) * * @param trans Widget instance * @param exp \e ExperimentReader instance - * @return \c TRUE on error, else \c FALSE + * @return \c TRUE on success, else \c FALSE */ gboolean gtk_experiment_transcript_load(GtkExperimentTranscript *trans, @@ -704,7 +704,7 @@ gtk_experiment_transcript_load(GtkExperimentTranscript *trans, gtk_experiment_transcript_text_layer_redraw(trans); - return trans->priv->contribs == NULL; + return trans->priv->contribs != NULL; } /** @@ -718,13 +718,13 @@ gtk_experiment_transcript_load(GtkExperimentTranscript *trans, * * @param trans Widget instance * @param filename \e ExperimentReader instance - * @return \c TRUE on error, else \c FALSE + * @return \c TRUE on success, else \c FALSE */ gboolean gtk_experiment_transcript_load_filename(GtkExperimentTranscript *trans, const gchar *filename) { - gboolean res = TRUE; + gboolean res = FALSE; ExperimentReader *exp = experiment_reader_new(filename); if (exp != NULL) { diff --git a/lib/gtk-vlc-player/gtk-vlc-player.c b/lib/gtk-vlc-player/gtk-vlc-player.c index 69801f3..351c7a2 100644 --- a/lib/gtk-vlc-player/gtk-vlc-player.c +++ b/lib/gtk-vlc-player/gtk-vlc-player.c @@ -420,7 +420,7 @@ gtk_vlc_player_new(void) * * @param player \e GtkVlcPlayer instance to load file into. * @param file \e Filename to load - * @return \c TRUE on error, else \c FALSE + * @return \c TRUE on success, else \c FALSE */ gboolean gtk_vlc_player_load_filename(GtkVlcPlayer *player, const gchar *file) @@ -430,11 +430,11 @@ gtk_vlc_player_load_filename(GtkVlcPlayer *player, const gchar *file) media = libvlc_media_new_path(player->priv->vlc_inst, (const char *)file); if (media == NULL) - return TRUE; + return FALSE; vlc_player_load_media(player, media); libvlc_media_release(media); - return FALSE; + return TRUE; } /** @@ -446,7 +446,7 @@ gtk_vlc_player_load_filename(GtkVlcPlayer *player, const gchar *file) * * @param player \e GtkVlcPlayer instance to load media into. * @param uri \e URI to load - * @return \c TRUE on error, else \c FALSE + * @return \c TRUE on success, else \c FALSE */ gboolean gtk_vlc_player_load_uri(GtkVlcPlayer *player, const gchar *uri) @@ -456,11 +456,11 @@ gtk_vlc_player_load_uri(GtkVlcPlayer *player, const gchar *uri) media = libvlc_media_new_location(player->priv->vlc_inst, (const char *)uri); if (media == NULL) - return TRUE; + return FALSE; vlc_player_load_media(player, media); libvlc_media_release(media); - return FALSE; + return TRUE; } /** @@ -134,7 +134,7 @@ file_menu_openmovie_item_activate_cb(GtkWidget *widget, file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - if (load_media_file(file)) { + if (!load_media_file(file)) { /* TODO */ } refresh_quickopen_menu(GTK_MENU(quickopen_menu)); @@ -163,7 +163,7 @@ file_menu_opentranscript_item_activate_cb(GtkWidget *widget, file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - if (load_transcript_file(file)) { + if (!load_transcript_file(file)) { /* TODO */ } refresh_quickopen_menu(GTK_MENU(quickopen_menu)); @@ -227,8 +227,8 @@ button_image_set_from_stock(GtkButton *widget, const gchar *name) gboolean load_media_file(const gchar *file) { - if (gtk_vlc_player_load_filename(GTK_VLC_PLAYER(player_widget), file)) - return TRUE; + if (!gtk_vlc_player_load_filename(GTK_VLC_PLAYER(player_widget), file)) + return FALSE; g_free(current_filename); current_filename = g_strdup(file); @@ -238,7 +238,7 @@ load_media_file(const gchar *file) button_image_set_from_stock(GTK_BUTTON(playpause_button), GTK_STOCK_MEDIA_PLAY); - return FALSE; + return TRUE; } gboolean @@ -249,27 +249,27 @@ load_transcript_file(const gchar *file) reader = experiment_reader_new(file); if (reader == NULL) - return TRUE; + return FALSE; res = gtk_experiment_transcript_load(GTK_EXPERIMENT_TRANSCRIPT(transcript_wizard_widget), reader); - if (res) { + if (!res) { g_object_unref(G_OBJECT(reader)); - return TRUE; + return FALSE; } res = gtk_experiment_transcript_load(GTK_EXPERIMENT_TRANSCRIPT(transcript_proband_widget), reader); - if (res) { + if (!res) { g_object_unref(G_OBJECT(reader)); - return TRUE; + return FALSE; } res = gtk_experiment_navigator_load(GTK_EXPERIMENT_NAVIGATOR(navigator_widget), reader); - if (res) { + if (!res) { g_object_unref(G_OBJECT(reader)); - return TRUE; + return FALSE; } g_object_unref(reader); @@ -277,7 +277,7 @@ load_transcript_file(const gchar *file) gtk_widget_set_sensitive(transcript_table, TRUE); gtk_widget_set_sensitive(navigator_scrolledwindow, TRUE); - return FALSE; + return TRUE; } void diff --git a/src/quick-open.c b/src/quick-open.c index ee614e1..d55fe50 100644 --- a/src/quick-open.c +++ b/src/quick-open.c @@ -234,7 +234,7 @@ quickopen_item_on_activate(GtkWidget *widget, gpointer user_data) gtk_container_foreach(GTK_CONTAINER(quickopen_menu), reconfigure_all_check_menu_items_cb, widget); - if (load_media_file(filename)) { + if (!load_media_file(filename)) { /* FIXME */ } @@ -248,7 +248,7 @@ quickopen_item_on_activate(GtkWidget *widget, gpointer user_data) } g_stpcpy(++p, EXPERIMENT_TRANSCRIPT_EXT); - if (load_transcript_file(trans_name)) { + if (!load_transcript_file(trans_name)) { /* FIXME */ } |