Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--po/POTFILES.in5
-rw-r--r--shell/ev-application.c4
-rw-r--r--shell/ev-window.c1
-rw-r--r--shell/main.c6
5 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 6251d5f..deaa312 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
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:
* shell/Makefile.am:
* shell/ev-application.c: (ev_application_class_init):
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e99dff1..c2e3197 100644
--- 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 632ec37..541b87e 100644
--- 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 9fc65da..fd819b3 100644
--- 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 8ad8f28..6b6e1ff 100644
--- 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);