← Back to branch summary

~noskcaj/ubuntu/wily/epiphany-browser/merge2

« back to all changes in this revision

Viewing changes to embed/ephy-embed-shell.c

Tags: upstream-2.28.0
Import upstream version 2.28.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
embed/ephy-embed-shell.c
15
15
 *  along with this program; if not, write to the Free Software
16
16
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
 *
18
 
 *  $Id$
19
18
 */
20
19
 
21
20
#include <config.h>
23
22
#include <glib.h>
24
23
 
25
24
#include <glib/gi18n.h>
 
25
#include <glib/gstdio.h>
26
26
#include <gtk/gtk.h>
27
27
 
28
28
#include "downloader-view.h"
29
29
#include "ephy-adblock-manager.h"
30
30
#include "ephy-debug.h"
31
 
#include "ephy-embed-factory.h"
32
31
#include "ephy-embed-shell.h"
33
32
#include "ephy-embed-single.h"
34
33
#include "ephy-encodings.h"
228
227
        if (priv->embed_single == NULL)
229
228
        {
230
229
                priv->embed_single = EPHY_EMBED_SINGLE
231
 
                        (ephy_embed_factory_new_object (EPHY_TYPE_EMBED_SINGLE));
 
230
                  (g_object_new (EPHY_TYPE_EMBED_SINGLE, NULL));
232
231
                g_assert (priv->embed_single != NULL);
233
232
 
234
 
                if (!ephy_embed_single_init (priv->embed_single))
 
233
                if (!ephy_embed_single_initialize (priv->embed_single))
235
234
                {
236
235
                        GtkWidget *dialog;
237
236
 
241
240
                                         GTK_MESSAGE_ERROR,
242
241
                                         GTK_BUTTONS_CLOSE,
243
242
                                         _("Epiphany can't be used now. "
244
 
                                                         "Mozilla initialization failed."));
 
243
                                           "Initialization failed."));
245
244
                        gtk_dialog_run (GTK_DIALOG (dialog));
246
245
 
247
246
                        exit (0);