From: Marco Pesenti Gritti <marco@src.gnome.org>
Date: Tue, 21 Dec 2004 17:58:23 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: EVINCE_0_1_0~124
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=7830a9deff653853c523c538494a700b65f69a43;p=evince.git

*** empty log message ***
---

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 00000000..5b235fff
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,26 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+intltool-extract
+intltool-extract.in
+intltool-merge
+intltool-merge.in
+intltool-update
+intltool-update.in
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+omf.make
+stamp-h1
+xmldocs.make
diff --git a/ChangeLog b/ChangeLog
index eefc2192..6251d5f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-21  Marco Pesenti Gritti  <marco@gnome.org>
+
+	* Makefile.am:
+	* shell/Makefile.am:
+	* shell/ev-application.c: (ev_application_class_init):
+	* shell/ev-window.c: (ev_window_dispose), (ev_window_class_init):
+
+	Make it build again
+
 2004-10-23  Martin Kretzschmar  <martink@gnome.org>
 
 	* ChangeLog, ggv/ChangeLog, gpdf/ChangeLog: merge the separate
diff --git a/Makefile.am b/Makefile.am
index afb1c968..5eef06ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = cut-n-paste data lib shell viewer po
+SUBDIRS = cut-n-paste data shell viewer po
 
 intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 571792c6..10e4930b 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -20,5 +20,4 @@ evince_SOURCES=				\
 
 evince_LDADD=					\
 	$(SHELL_LIBS)				\
-	$(top_builddir)/lib/libevprivate.a	\
 	$(NULL)
diff --git a/shell/ev-application.c b/shell/ev-application.c
index 2a89eaa1..632ec373 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -30,7 +30,6 @@
 #include <gtk/gtkwidget.h>
 #include <bonobo/bonobo-main.h>
 
-#include <ev-macros.h>
 #include <ev-window.h>
 
 struct _EvApplicationPrivate {
@@ -165,24 +164,12 @@ ev_application_open (EvApplication *application, GError *err)
 	gtk_widget_destroy (GTK_WIDGET (chooser));
 }
 
-static void
-ev_application_finalize (GObject *object)
-{
-	g_return_if_fail (object != NULL && EV_IS_APPLICATION (object));
-
-	EV_APPLICATION (object)->priv = NULL;
-
-	EV_CALL_VIRTUAL (
-		G_OBJECT_CLASS (ev_application_parent_class), finalize, (object));
-}
-
 static void
 ev_application_class_init (EvApplicationClass *ev_application_class)
 {
 	GObjectClass *g_object_class;
 
 	g_object_class = G_OBJECT_CLASS (ev_application_class);
-	g_object_class->finalize = ev_application_finalize;
 
 	g_type_class_add_private (g_object_class,
 				  sizeof (EvApplicationPrivate));
diff --git a/shell/ev-window.c b/shell/ev-window.c
index cde05186..9fc65dae 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -44,9 +44,6 @@
 
 #include <string.h>
 
-#include <ev-macros.h>
-#include <ev-stock-icons.h>
-
 #include "ev-application.h"
 
 enum {
@@ -72,6 +69,8 @@ struct _EvWindowPrivate {
 static guint ev_window_signals [N_SIGNALS] = { 0 };
 #endif
 
+static GObjectClass *parent_class = NULL;
+
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
 #define EV_WINDOW_GET_PRIVATE(object) \
@@ -351,21 +350,9 @@ ev_window_dispose (GObject *object)
 
 	priv = EV_WINDOW (object)->priv;
 
-	EV_UNREF (priv->ui_manager);
-
-	EV_CALL_VIRTUAL (
-		G_OBJECT_CLASS (ev_window_parent_class), dispose, (object));
-}
-
-static void
-ev_window_finalize (GObject *object)
-{
-	g_return_if_fail (object != NULL && EV_IS_WINDOW (object));
+	g_object_unref (priv->ui_manager);
 
-	EV_WINDOW (object)->priv = NULL;
-
-	EV_CALL_VIRTUAL (
-		G_OBJECT_CLASS (ev_window_parent_class), finalize, (object));
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
@@ -373,9 +360,10 @@ ev_window_class_init (EvWindowClass *ev_window_class)
 {
 	GObjectClass *g_object_class;
 
+	parent_class = g_type_class_peek_parent (ev_window_class);
+
 	g_object_class = G_OBJECT_CLASS (ev_window_class);
 	g_object_class->dispose = ev_window_dispose;
-	g_object_class->finalize = ev_window_finalize;
 
 	g_type_class_add_private (g_object_class, sizeof (EvWindowPrivate));
 
@@ -427,7 +415,7 @@ static GtkActionEntry entries[] = {
 	  G_CALLBACK (ev_window_cmd_file_close_window) },
 
 	/* Help menu */
-	{ "HelpAbout", STOCK_ABOUT, N_("_About"), NULL,
+	{ "HelpAbout", NULL, N_("_About"), NULL,
 	  N_("Display credits for the document viewer creators"),
 	  G_CALLBACK (ev_window_cmd_help_about) },
 };