← Back to branch summary

~l3on/ubuntu/precise/epiphany-extensions/new-release

« back to all changes in this revision

Viewing changes to extensions/error-viewer/mozilla/mozilla-helpers.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-09-18 14:08:05 UTC
  • mfrom: (1.1.36 upstream)
  • Revision ID: james.westby@ubuntu.com-20090918140805-fa8kka5uo6u5l5io
Tags: 2.27.92-0ubuntu1
* new upstream 2.27.92 ships ships epiphany-webkit extensions only
  - update debian/control - move from epiphany-browser to -webkit
  - update debian/rules - drop link creation that tried to support -browser
    and -webkit parts and run dh_pysupport on epiphany-webkit dir
  - update debian/rules - use really-all extensions
  - add debian/patches/02_greasemonkey_web_view.patch - fix greasemonkey
    extension being broken by bad web_view lookup - bgo 595814

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/error-viewer/mozilla/mozilla-helpers.cpp
20
20
#include "mozilla-config.h"
21
21
#include "config.h"
22
22
 
23
 
#ifdef XPCOM_GLUE
24
 
#include <nsXPCOMGlue.h>
25
 
#include <gtkmozembed_glue.cpp>
26
 
#endif
27
 
 
28
23
#include <nsStringAPI.h>
29
24
 
30
25
#include <gtkmozembed.h>
44
39
mozilla_get_doctype (EphyEmbed *embed)
45
40
{
46
41
        nsCOMPtr<nsIWebBrowser> browser;
47
 
        gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
 
42
        gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
48
43
                                         getter_AddRefs (browser));
49
44
        NS_ENSURE_TRUE (browser, NULL);
50
45
 
75
70
mozilla_get_content_type (EphyEmbed *embed)
76
71
{
77
72
        nsCOMPtr<nsIWebBrowser> browser;
78
 
        gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))),
 
73
        gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (embed),
79
74
                                         getter_AddRefs (browser));
80
75
        NS_ENSURE_TRUE (browser, NULL);
81
76
 
99
94
 
100
95
        return g_strdup (cType.get());
101
96
}
102
 
 
103
 
gboolean
104
 
mozilla_glue_startup (void)
105
 
{
106
 
#ifdef XPCOM_GLUE
107
 
        static const GREVersionRange greVersion = {
108
 
          "1.9a", PR_TRUE,
109
 
          "2", PR_TRUE
110
 
        };
111
 
        char xpcomLocation[4096];
112
 
 
113
 
        if (NS_FAILED (GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, sizeof (xpcomLocation))) ||
114
 
            NS_FAILED (XPCOMGlueStartup (xpcomLocation)) ||
115
 
            NS_FAILED (GTKEmbedGlueStartup ()) ||
116
 
            NS_FAILED (GTKEmbedGlueStartupInternal()))
117
 
                return FALSE;
118
 
 
119
 
        return TRUE;
120
 
#else
121
 
        return TRUE;
122
 
#endif /* XPCOM_GLUE */
123
 
}