← Back to branch summary

~ubuntu-branches/ubuntu/vivid/xiphos/vivid-proposed

« back to all changes in this revision

Viewing changes to src/xiphos_html/xiphos_html.c

  • Committer: Package Import Robot
  • Author(s): Dimitri John Ledkov
  • Date: 2014-07-12 17:08:46 UTC
  • mfrom: (17.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140712170846-1lcybpijz5fn72fg
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/xiphos_html/xiphos_html.c
2
2
 * Xiphos Bible Study Tool
3
3
 * xiphos_html.c - toolkit-generalized html support
4
4
 *
5
 
 * Copyright (C) 2010-2011 Xiphos Developer Team
 
5
 * Copyright (C) 2010-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
21
21
 
22
22
#include "xiphos_html.h"
23
23
 
24
 
#ifndef GTKHTML
25
24
XiphosHtml *xiphos_html_new(DIALOG_DATA * dialog, gboolean is_dialog, gint pane)
26
25
{
27
26
        XiphosHtml *html;
28
27
        html = XIPHOS_HTML(g_object_new(XIPHOS_TYPE_HTML, NULL));
29
28
        XiphosHtmlPriv *priv = XIPHOS_HTML_GET_PRIVATE(html);
30
29
 
31
 
#if !defined(USE_WEBKIT) && defined(USE_GTKMOZEMBED)
32
 
        /* gecko, which has weird "structure privacy" needs */
33
 
        gecko_html_set_parms(html, priv, dialog, is_dialog, pane);
34
 
#else
35
 
        /* webkit or gtkhtml */
36
30
        priv->pane = pane;
37
31
        priv->is_dialog = is_dialog;
38
32
        priv->dialog = dialog;
39
 
#endif /* USE_WEBKIT || !USE_GTKMOZEMBED */
40
33
        
41
34
        return html;
42
35
}
43
 
#endif /* !GTKHTML */