projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reset Glk style hints at beginning of program
[projects/chimara/chimara.git]
/
player
/
main.c
diff --git
a/player/main.c
b/player/main.c
index bd007b4ee128b0a7966822a37c547ca98c7b7c85..a4739f79f8ebd2d31d017690a4b612ddad486c53 100644
(file)
--- a/
player/main.c
+++ b/
player/main.c
@@
-95,7
+95,7
@@
change_window_title(ChimaraGlk *glk, GParamSpec *pspec, GtkWindow *window)
g_free(title);
}
g_free(title);
}
-static
void
+static
gboolean
create_window(void)
{
GError *error = NULL;
create_window(void)
{
GError *error = NULL;
@@
-107,8
+107,7
@@
create_window(void)
error = NULL;
if( !gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", &error) ) {
#endif /* DEBUG */
error = NULL;
if( !gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", &error) ) {
#endif /* DEBUG */
- error_dialog(NULL, error, "Error while building interface: ");
- return;
+ return FALSE;
#ifdef DEBUG
}
#endif /* DEBUG */
#ifdef DEBUG
}
#endif /* DEBUG */
@@
-144,13
+143,9
@@
create_window(void)
#ifdef DEBUG
g_error_free(error);
error = NULL;
#ifdef DEBUG
g_error_free(error);
error = NULL;
- if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
-#endif /* DEBUG */
- error_dialog(NULL, error, "Error while building interface: ");
- return;
-#ifdef DEBUG
- }
+ if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) )
#endif /* DEBUG */
#endif /* DEBUG */
+ return FALSE;
}
glk = chimara_if_new();
}
glk = chimara_if_new();
@@
-162,26
+157,19
@@
create_window(void)
#ifdef DEBUG
g_error_free(error);
error = NULL;
#ifdef DEBUG
g_error_free(error);
error = NULL;
- if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_SRC_DIR "/style.css", &error) ) {
-#endif /* DEBUG */
- error_dialog(NULL, error, "Couldn't open CSS file: ");
- return;
-#ifdef DEBUG
- }
+ if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_SRC_DIR "/style.css", &error) )
#endif /* DEBUG */
#endif /* DEBUG */
+ return FALSE;
}
/* DON'T UNCOMMENT THIS your eyes will burn
but it is a good test of programmatically altering just one style
chimara_glk_set_css_from_string(CHIMARA_GLK(glk),
}
/* DON'T UNCOMMENT THIS your eyes will burn
but it is a good test of programmatically altering just one style
chimara_glk_set_css_from_string(CHIMARA_GLK(glk),
- "buffer
.normal
{ font-family: 'Comic Sans MS'; }");*/
+ "buffer { font-family: 'Comic Sans MS'; }");*/
GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") );
if(vbox == NULL)
GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") );
if(vbox == NULL)
- {
- error_dialog(NULL, NULL, "Could not find vbox");
- return;
- }
+ return FALSE;
gtk_ui_manager_insert_action_group(uimanager, actiongroup, 0);
GtkWidget *menubar = gtk_ui_manager_get_widget(uimanager, "/menubar");
gtk_ui_manager_insert_action_group(uimanager, actiongroup, 0);
GtkWidget *menubar = gtk_ui_manager_get_widget(uimanager, "/menubar");
@@
-206,6
+194,8
@@
create_window(void)
/* Create preferences window */
preferences_create(CHIMARA_GLK(glk));
/* Create preferences window */
preferences_create(CHIMARA_GLK(glk));
+
+ return TRUE;
}
int
}
int
@@
-219,8
+209,6
@@
main(int argc, char *argv[])
textdomain(GETTEXT_PACKAGE);
#endif
textdomain(GETTEXT_PACKAGE);
#endif
- if( !g_thread_supported() )
- g_thread_init(NULL);
gdk_threads_init();
gtk_init(&argc, &argv);
gdk_threads_init();
gtk_init(&argc, &argv);
@@
-243,7
+231,10
@@
main(int argc, char *argv[])
state_settings = g_settings_new_with_backend("org.chimara-if.player.state", backend);
g_free(keyfile);
state_settings = g_settings_new_with_backend("org.chimara-if.player.state", backend);
g_free(keyfile);
- create_window();
+ if( !create_window() ) {
+ error_dialog(NULL, NULL, "Error while building interface.");
+ return 1;
+ }
gtk_widget_show_all(window);
g_object_unref( G_OBJECT(uimanager) );
gtk_widget_show_all(window);
g_object_unref( G_OBJECT(uimanager) );