← Back to branch summary

~ubuntu-branches/debian/sid/xiphos/sid

« back to all changes in this revision

Viewing changes to src/gnome2/navbar_versekey_dialog.c

  • Committer: Package Import Robot
  • Author(s): Dimitri John Ledkov
  • Date: 2014-07-12 17:08:46 UTC
  • mfrom: (1.3.3)
  • Revision ID: package-import@ubuntu.com-20140712170846-ja9jzhgt51d3fkrd
Tags: 3.2.2+dfsg1-1
* New upstream release.
* Bump standards version.
* Switch uscan to sf.net redirector.
* Unpack waf in get-orig-source target.
* Bump to debhelper 9.
* Add uuid-dev build-dep.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome2/navbar_versekey_dialog.c
2
2
 * Xiphos Bible Study Tool
3
3
 * navbar_verse_dialog.c - navigation bar for versekey modules in dialogs
4
4
 *
5
 
 * Copyright (C) 2000-2011 Xiphos Developer Team
 
5
 * Copyright (C) 2000-2014 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
304
304
        time_diff = ((end_time.tv_sec - start_time.tv_sec) * 1000000) + (end_time.tv_usec - start_time.tv_usec);
305
305
        time_add = 0;
306
306
        if (time_diff > 10000)
307
 
          time_add = (guint32)(time_diff / 1000);
 
307
                time_add = (guint32)(time_diff / 1000);
308
308
#endif
309
309
        if (!menu)
310
310
                return 0;
821
821
                         "button_press_event",
822
822
                         G_CALLBACK(select_verse_button_press_callback),
823
823
                         dialog);
 
824
#ifndef HAVE_GTK_34     
824
825
        g_signal_connect ((gpointer)navbar.button_verse_menu , "scroll_event",
825
826
                         G_CALLBACK (on_button_verse_menu_verse_scroll_event),
826
827
                         dialog);
830
831
        g_signal_connect ((gpointer)navbar.button_book_menu , "scroll_event",
831
832
                         G_CALLBACK (on_button_verse_menu_book_scroll_event),
832
833
                         dialog);
 
834
#endif
833
835
}
834
836
 
835
837
 
856
858
#else
857
859
        GladeXML *gxml;
858
860
#endif
 
861
#ifdef HAVE_GTK_34
 
862
        GtkWidget * eventbox;
 
863
#endif
 
864
        
859
865
        gchar *glade_file = gui_general_user_file("navbar_versekey" UI_SUFFIX, FALSE);
860
866
        g_return_val_if_fail((glade_file != NULL), NULL);
861
867
        GS_message(("%s",glade_file));
912
918
        dialog->navbar.label_chapter_menu = UI_GET_ITEM(gxml, "label_chapter");
913
919
        dialog->navbar.label_verse_menu = UI_GET_ITEM(gxml, "label_verse");
914
920
 
915
 
        dialog->navbar.book_menu = gtk_menu_new();
916
 
        dialog->navbar.chapter_menu = gtk_menu_new();
917
 
        dialog->navbar.verse_menu = gtk_menu_new();
 
921
#ifdef HAVE_GTK_34      
 
922
        eventbox = UI_GET_ITEM(gxml, "eventbox_book");
 
923
        g_signal_connect ((gpointer) eventbox, "scroll_event",
 
924
                         G_CALLBACK (on_button_verse_menu_book_scroll_event),
 
925
                         dialog);
 
926
        
 
927
        eventbox = UI_GET_ITEM(gxml, "eventbox_chapter");
 
928
        g_signal_connect ((gpointer) eventbox, "scroll_event",
 
929
                         G_CALLBACK (on_button_verse_menu_chapter_scroll_event),
 
930
                         dialog);
 
931
        
 
932
        eventbox = UI_GET_ITEM(gxml, "eventbox_verse");
 
933
        g_signal_connect ((gpointer) eventbox, "scroll_event",
 
934
                         G_CALLBACK (on_button_verse_menu_verse_scroll_event),
 
935
                         dialog);
 
936
#endif
 
937
                
918
938
        _connect_signals(dialog->navbar, dialog);
919
939
 
920
940
        return dialog->navbar.navbar;