← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gnome2/sidebar_dialog.c

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs, Dmitrijs Ledkovs
  • Date: 2012-03-11 18:43:32 UTC
  • mfrom: (17.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20120311184332-splq3ecpx7tyi87d
Tags: 3.1.5+dfsg-1
http://bugs.debian.org/654511
[ Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> ]  
* New upstream release.
* Build using webkit backend
* Contains unpacked source for waf binary (Closes: #654511)
* Update debian/copyright to latest specification

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome2/sidebar_dialog.c
2
2
 * Xiphos Bible Study Tool
3
3
 * sidebar_dialog.c - dialog for detached sidebar
4
4
 *
5
 
 * Copyright (C) 2000-2010 Xiphos Developer Team
 
5
 * Copyright (C) 2000-2011 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
39
39
 
40
40
#include "gui/debug_glib_null.h"
41
41
 
42
 
#ifdef USE_GTKMOZEMBED
43
 
#ifdef WIN32
44
 
#include "geckowin/gecko-html.h"
45
 
#else
46
 
#include "gecko/gecko-html.h"
47
 
#endif
48
 
#endif
 
42
#include "../xiphos_html/xiphos_html.h"
49
43
 
50
44
static GtkWidget* create_sidebar_dialog(void);
51
45
static GtkWidget * vbox_dock;
82
76
                                       biblepanesize);*/
83
77
                
84
78
                /* ugly fix until someone can make mozembed work with 'gtk_widget_reparent()' */
85
 
#ifdef USE_GTKMOZEMBED
 
79
#ifdef USE_XIPHOS_HTML
86
80
                gtk_widget_destroy(sidebar.html_viewer_widget);
87
 
                sidebar.html_viewer_widget = GTK_WIDGET(gecko_html_new(NULL, FALSE, SB_VIEWER_TYPE));
 
81
                sidebar.html_viewer_widget = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, SB_VIEWER_TYPE));
88
82
                gtk_container_add(GTK_CONTAINER(sidebar.html_viewer_eventbox), sidebar.html_viewer_widget);
89
83
#endif
90
84
                /* */
104
98
                                    widgets.epaned);
105
99
                
106
100
                /* ugly fix until someone can make mozembed work with 'gtk_widget_reparent()' */
107
 
#ifdef USE_GTKMOZEMBED
 
101
#ifdef USE_XIPHOS_HTML
108
102
                gtk_widget_destroy(sidebar.html_viewer_widget);
109
 
                sidebar.html_viewer_widget = GTK_WIDGET(gecko_html_new(NULL, FALSE, SB_VIEWER_TYPE));
 
103
                sidebar.html_viewer_widget = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, SB_VIEWER_TYPE));
110
104
                gtk_container_add(GTK_CONTAINER(sidebar.html_viewer_eventbox), sidebar.html_viewer_widget);
111
105
#endif
112
106
                gtk_widget_show(sidebar.html_viewer_widget);
136
130
 *   void
137
131
 */
138
132
 
139
 
static void on_dialog_destroy(GtkObject *object, gpointer user_data)
 
133
static void on_dialog_destroy(GObject *object, gpointer user_data)
140
134
{
141
135
        /* we need the if to prevent a loop */
142
136
        if (!settings.docked)