← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extensions/select-stylesheet/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/select-stylesheet/mozilla/mozilla-helpers.cpp
27
27
 
28
28
#include <glib/gi18n-lib.h>
29
29
 
30
 
#ifdef XPCOM_GLUE
31
 
#include <nsXPCOMGlue.h>
32
 
#include <gtkmozembed_glue.cpp>
33
 
#endif
34
 
 
35
30
#include <nsStringAPI.h>
36
31
 
37
32
#include <gtkmozembed.h>
108
103
        NS_ENSURE_TRUE (aEmbed, NS_ERROR_FAILURE);
109
104
 
110
105
        nsCOMPtr<nsIWebBrowser> browser;
111
 
        gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (aEmbed))),
112
 
                                         getter_AddRefs (browser));
 
106
        gtk_moz_embed_get_nsIWebBrowser (
 
107
                        GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (aEmbed))),
 
108
                        getter_AddRefs (browser));
113
109
        NS_ENSURE_TRUE (browser, NS_ERROR_FAILURE);
114
110
 
115
111
        nsCOMPtr<nsIDOMWindow> domWindow;
295
291
                item->SetDisabled (strcmp (cTitle.get(), aSelected->mName) != 0);
296
292
        }
297
293
}
298
 
 
299
 
gboolean
300
 
mozilla_glue_startup (void)
301
 
{
302
 
#ifdef XPCOM_GLUE
303
 
        static const GREVersionRange greVersion = {
304
 
          "1.9a", PR_TRUE,
305
 
          "2", PR_TRUE
306
 
        };
307
 
        char xpcomLocation[4096];
308
 
 
309
 
        if (NS_FAILED (GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, sizeof (xpcomLocation))) ||
310
 
            NS_FAILED (XPCOMGlueStartup (xpcomLocation)) ||
311
 
            NS_FAILED (GTKEmbedGlueStartup ()) ||
312
 
            NS_FAILED (GTKEmbedGlueStartupInternal()))
313
 
                return FALSE;
314
 
 
315
 
        return TRUE;
316
 
#else
317
 
        return TRUE;
318
 
#endif /* XPCOM_GLUE */
319
 
}