← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xiphos/trusty

« back to all changes in this revision

Viewing changes to src/main/url.cc

  • Committer: Bazaar Package Importer
  • Author(s): Dmitrijs Ledkovs
  • Date: 2009-08-12 19:21:05 UTC
  • Revision ID: james.westby@ubuntu.com-20090812192105-dw40gql5mdqvgx84
Tags: 3.1.1-1
http://bugs.debian.org/539190
http://bugs.debian.org/539880
* New upstream release (bugfix)

* debian/copyright updates:
  - help/* is GFDL and referencing license file as per policy 3.8.2
  - updated copyright holders (Gnomesword -> Xiphos)

* debian/control:
  - Bumped standards version (Changed debian/copyright as above)
  - Updated VCS-Bzr field to point to a working URL
  - Fixed typo in debian/control (Closes: #539190)
  - Updated extended description of xiphos package (Closes: #539880)
  - Significantly improved wording of all descriptions
  - Added Conflicts: xiphos-svn - upstream deb package name for svn builds

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/url.cc
2
2
 * Xiphos Bible Study Tool
3
3
 * url.cc - support functions
4
4
 *
5
 
 * Copyright (C) 2004-2008 Xiphos Developer Team
 
5
 * Copyright (C) 2004-2009 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
52
52
#include "gui/parallel_dialog.h"
53
53
#include "gui/parallel_view.h"
54
54
#include "gui/main_window.h"
55
 
#include "gui/toolbar_nav.h"
 
55
//#include "gui/toolbar_nav.h"
56
56
 
57
57
#include "main/url.hh"
58
58
#include "main/lists.h"
283
283
        }
284
284
        if(!strcmp(stype,"verse")) {
285
285
                if(clicked) {
286
 
#ifdef OLD_NAVBAR
287
 
                        settings.cvparallel = backend->get_valid_key(svalue);
288
 
                        main_update_parallel_page_detached();
289
 
                        gui_set_parallel_navbar((char*)svalue);
290
 
#else
291
286
                        gtk_entry_set_text(GTK_ENTRY(navbar_parallel.lookup_entry),svalue);
292
287
                        gtk_widget_activate(navbar_parallel.lookup_entry);
293
 
#endif
294
288
                } 
295
289
        }
296
290
        return 1;
352
346
}
353
347
 
354
348
 
355
 
 /******************************************************************************
 
349
/******************************************************************************
356
350
 * Name
357
351
 *   show_strongs
358
352
 *
359
353
 * Synopsis
360
354
 *   #include "main/url.hh"
361
355
 *
362
 
 *   gint show_strongs(const gchar * type, const gchar * value, 
363
 
                        gboolean clicked)
 
356
 *   gint show_strongs(const gchar * type, const gchar * value, gboolean clicked)
364
357
 *
365
358
 * Description
366
359
 *  
814
807
                switch(mod_type) {
815
808
                        case TEXT_TYPE:
816
809
                                key = main_update_nav_controls(tmpkey);
817
 
                                main_display_commentary(NULL, key);
 
810
                                if (settings.comm_showing)
 
811
                                        main_display_commentary(NULL, key);
818
812
                                main_display_bible(work_buf[MODULE], key);
819
813
                                main_keep_bibletext_dialog_in_sync((gchar*)key);
820
814
                                editor_sync_with_main();
957
951
                        if (passage) g_free(passage);
958
952
                }
959
953
 
 
954
                else if (!strcmp(action, "showUserNote")) {
 
955
                        module = g_strdup(m_url.getParameterValue("module"));
 
956
                        passage = g_strdup((gchar*)m_url.getParameterValue("passage"));
 
957
                        main_information_viewer(module,
 
958
                                                (gchar*)svalue,
 
959
                                                (gchar*)passage, 
 
960
                                                "showUserNote",
 
961
                                                (gchar*)"u",
 
962
                                                NULL,
 
963
                                                NULL);
 
964
                        if (module) g_free(module);
 
965
                        if (passage) g_free(passage);
 
966
                }
 
967
 
960
968
                else if (!strcmp(action, "showRef")) {
961
969
                        module = g_strdup(m_url.getParameterValue("module"));
962
970
                        if (!strcmp(stype, "scripRef"))