Actually show the window...

2004-12-21  Marco Pesenti Gritti  <marco@gnome.org>

        * po/POTFILES.in:
        * shell/ev-application.c: (window_destroy_cb):
        * shell/ev-window.c:
        * shell/main.c: (main):

        Actually show the window...

diff --git a/ChangeLog b/ChangeLog
index 6251d5f8df49664beba35421c8d6236b5b69ac12..deaa312ba099b897c845c04c9a3624e0716c8320 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-21  Marco Pesenti Gritti  <marco@gnome.org>
+
+       * po/POTFILES.in:
+       * shell/ev-application.c: (window_destroy_cb):
+       * shell/ev-window.c:
+       * shell/main.c: (main):
+
+       Actually show the window...
+
 2004-12-21  Marco Pesenti Gritti  <marco@gnome.org>
 
        * Makefile.am:

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e99dff1c532f66fd562866ca4a13f30a36e66c91..c2e3197c8bd45627b5dc64825250b82dd304acab 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,3 @@
 [encoding: UTF-8]
-gs-renderer/GNOME_GGV.server.in.in
-gs-renderer/ggv-control-ui.xml
-gs-renderer/ggv-postscript-view-ui.xml
-gs-renderer/ggv-postscript-view.c
-gs-renderer/ggv-sidebar.c
 shell/ev-application.c
 shell/ev-window.c

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 632ec373d2a7c9704818d3ccdb0df51c18e41aa9..541b87ec02f3845689a93a72365db7d8b1c438b8 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -28,7 +28,7 @@
 #include <gtk/gtkfilechooserdialog.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkwidget.h>
-#include <bonobo/bonobo-main.h>
+#include <gtk/gtkmain.h>
 
 #include <ev-window.h>
 
@@ -66,7 +66,7 @@ window_destroy_cb (GtkObject *object, gpointer user_data)
                g_list_remove (application->priv->windows, object);
 
        if (application->priv->windows == NULL)
-               bonobo_main_quit ();
+               gtk_main_quit ();
 }
 
 EvWindow *

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 9fc65dae9423a1a3517017cde3e056801ebc2e2c..fd819b36742cb6790977174f2fdb9135c37b4916 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -39,7 +39,6 @@
 #include <gtk/gtktoggleaction.h>
 #include <gtk/gtkuimanager.h>
 #include <gtk/gtkvbox.h>
-#include <libbonoboui.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 
 #include <string.h>

diff --git a/shell/main.c b/shell/main.c
index 8ad8f284ceee9267109ec71a8199ff5f3f44e801..6b6e1ffd68eff8f4ea254799d1ce5d98a3be1612 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "ev-application.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
 #include <libgnome/gnome-program.h>
@@ -36,6 +38,7 @@ main (int argc, char *argv[])
        poptContext context;
         GValue context_as_value = { 0 };
        GnomeProgram *program;
+       GtkWidget *window;
 
 #ifdef ENABLE_NLS
        /* Initialize the i18n stuff */
@@ -58,6 +61,9 @@ main (int argc, char *argv[])
                                g_value_init (&context_as_value, G_TYPE_POINTER));
         context = g_value_get_pointer (&context_as_value);
 
+       window = GTK_WIDGET (ev_application_new_window (EV_APP));
+       gtk_widget_show (window);
+
        gtk_main ();
 
        poptFreeContext (context);