← Back to branch summary

~ubuntu-branches/ubuntu/raring/xiphos/raring

« back to all changes in this revision

Viewing changes to src/gnome2/xiphos.c

  • Committer: Bazaar Package Importer
  • Author(s): Dmitrijs Ledkovs, Jonathan Marsden, Dmitrijs Ledkovs
  • Date: 2010-11-25 21:26:48 UTC
  • mfrom: (2.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20101125212648-mc64wvs0nw3xp7bx
Tags: 3.1.4-1
[ Jonathan Marsden ]
* New upstream release 3.1.4
* Removed debian/patch/* since the one patch was included upstream.
* Bumped Standards-Version to 3.9.1 (no changes required).
* debian/README.Debian: Corrected spelling and reworded for clarity.
* debian/control: Add Jonathan Marsden back into Uploaders.

[ Dmitrijs Ledkovs ]
* Added local options dpkg-source to unapply patches and fail on
  upstream source changes (ignoring false positives).
* Added bzr-builddeb hook to generate source-format before build. If you
  are not using bzr-builddeb, you must run "./debian/rules clean" before
  building.
* patches/xul-2.0.patch: bump UPPER_RANGE to allow running against xul20.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome2/xiphos.c
2
2
 * Xiphos Bible Study Tool
3
3
 * xiphos.c -
4
4
 *
5
 
 * Copyright (C) 2000-2009 Xiphos Developer Team
 
5
 * Copyright (C) 2000-2010 Xiphos Developer Team
6
6
 *
7
7
 * This program is free software; you can redistribute it and/or modify
8
8
 * it under the terms of the GNU General Public License as published by
96
96
        GS_print(("%s\n", "Initiating Xiphos"));
97
97
        settings.comm_showing = TRUE;
98
98
        settings.displaySearchResults = FALSE;
99
 
        settings.havethayer = main_is_module("Thayer");
100
 
        settings.havebdb = main_is_module("BDB");
101
99
 
102
100
        /*
103
101
         *  setup sidebar
109
107
         */
110
108
        if (settings.havebible) {
111
109
                main_check_parallel_modules();
112
 
                main_init_parallel_view();
 
110
                main_init_parallel_view();      
 
111
                gui_create_parallel_page();
 
112
                gtk_widget_realize(widgets.html_parallel);      
 
113
                main_set_parallel_options_at_start();
113
114
        }
114
115
 
115
116
        settings.paratab_showing = FALSE;
137
138
 */
138
139
 
139
140
 
140
 
void frontend_display(void)
 
141
void frontend_display(const char *tabs)
141
142
{
142
143
        GS_print(("%s\n", "Displaying Xiphos"));
143
144
        gui_show_main_window();
178
179
#endif
179
180
        // setup passage notebook
180
181
//      if (settings.browsing) {
181
 
        gui_notebook_main_setup (settings.browsing);
 
182
        gui_notebook_main_setup (settings.browsing, tabs);
182
183
/*      } else {
183
184
                url = g_strdup_printf("sword://%s/%s",settings.DictWindowModule,
184
185
                                                      settings.dictkey);
208
209
                           NULL );
209
210
        gui_show_previewer_in_sidebar(settings.show_previewer_in_sidebar);
210
211
 
 
212
        if (settings.parallelpage)
 
213
                on_undockInt_activate(NULL);
211
214
 
212
215
        if (settings.showdevotional)
213
216
                main_display_devotional();
276
279
 
277
280
        /* free dir and file stuff */
278
281
        g_free(settings.gSwordDir);
279
 
        g_free(settings.shortcutbarDir);
280
282
        g_free(settings.fnconfigure);
281
283
        g_free(settings.swbmDir);
282
284