Remove conditional compilation of recent files

[projects/chimara/chimara.git] / player / player.c

diff --git a/player/player.c b/player/player.c
index b59da1b374aa7d4921bcd3ddf856e61854e6d972..d8b094f236d90096be492ebbea1efdb7a4e5e9eb 100644 (file)
--- a/player/player.c
+++ b/player/player.c
@@ -1,4 +1,5 @@
 #include <glib-object.h>
+#include <glib/gi18n.h>
 #include <libchimara/chimara-glk.h>
 #include <libchimara/chimara-if.h>
 #include "player.h"
@@ -92,11 +93,19 @@ static void
 chimara_player_init(ChimaraPlayer *self)
 {      
        GError *error = NULL;
-       
+
+       /* Set parent properties */
+       g_object_set(self,
+               "title", _("Chimara"),
+               "default-width", 600,
+               "default-height", 800,
+               NULL);
+
+       /* Construct user interface */
        GtkBuilder *builder = gtk_builder_new();
        char *object_ids[] = {
                "actiongroup",
-               "vbox",
+               "player-vbox",
                NULL
        };
        
@@ -123,11 +132,11 @@ chimara_player_init(ChimaraPlayer *self)
        //g_settings_bind(state_settings, "show-toolbar-default", toolbar_action, "active", G_SETTINGS_BIND_SET);
                
        GtkUIManager *uimanager = gtk_ui_manager_new();
-       if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_DATA_DIR "/chimara.menus", &error) ) {
+       if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_DATA_DIR "/player.menus", &error) ) {
 #ifdef DEBUG
                g_error_free(error);
                error = NULL;
-               if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
+               if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/player.menus", &error) ) {
 #endif /* DEBUG */
                        error_dialog(NULL, error, "Error while building interface: ");
                        return;
@@ -159,7 +168,7 @@ chimara_player_init(ChimaraPlayer *self)
         chimara_glk_set_css_from_string(CHIMARA_GLK(glk),
         "buffer.normal { font-family: 'Comic Sans MS'; }");*/
        
-       GtkBox *vbox = GTK_BOX(load_object(builder, "vbox"));                   
+       GtkBox *vbox = GTK_BOX(load_object(builder, "player-vbox"));    
 
        ChimaraApp *theapp = chimara_app_get();
 
@@ -301,10 +310,3 @@ on_quit_activate(GtkAction *action, ChimaraPlayer *player)
        chimara_glk_feed_line_input(CHIMARA_GLK(player->glk), "quit");
 }
 
-gboolean 
-on_window_delete_event(GtkWidget *widget, GdkEvent *event, ChimaraPlayer *player) 
-{
-       gtk_main_quit();
-       return TRUE;
-}
-