aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2012-06-07 19:41:12 +0200
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2012-06-07 19:41:12 +0200
commit1d6bec72e636899ff2d71e5a9dad6e06cc9908a6 (patch)
treea4f96ca6bb188bfc1885b7fbd844681ad7ab8f8e /src
parent50c9ef3ffc739bdb6d0b437a495928ea57728550 (diff)
downloadexperiment-player-1d6bec72e636899ff2d71e5a9dad6e06cc9908a6.tar.gz
cleaned up success/failure return value confusion
TRUE means successful, FALSE unsuccessful
Diffstat (limited to 'src')
-rw-r--r--src/main.c26
-rw-r--r--src/quick-open.c4
2 files changed, 15 insertions, 15 deletions
diff --git a/src/main.c b/src/main.c
index 1fa852e..1771804 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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 */
}