Use normal style color for the widget background and draw a black box

[evince.git] / shell / ev-application.c

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 2a89eaa151a719b0ed6999690bceae87bcb8ff0d..6664c6a8a79bf2c0332fdc42245a3376e1dbf778 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -28,10 +28,7 @@
 #include <gtk/gtkfilechooserdialog.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkwidget.h>
-#include <bonobo/bonobo-main.h>
-
-#include <ev-macros.h>
-#include <ev-window.h>
+#include <gtk/gtkmain.h>
 
 struct _EvApplicationPrivate {
        GList *windows;
@@ -67,7 +64,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 *
@@ -116,8 +113,7 @@ ev_application_open (EvApplication *application, GError *err)
 {
        EvWindow *ev_window;
        GtkWidget *chooser;
-       GtkFileFilter *both_filter, *pdf_filter, *ps_filter, *all_filter;
-
+       GtkFileFilter *both_filter, *pdf_filter, *ps_filter, *pixbuf_filter, *all_filter;
 
        ev_window = ev_application_get_empty_window (application);
 
@@ -146,11 +142,16 @@ ev_application_open (EvApplication *application, GError *err)
        gtk_file_filter_add_mime_type (pdf_filter, "application/pdf");
        gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), pdf_filter);
 
+       pixbuf_filter = gtk_file_filter_new ();
+       gtk_file_filter_set_name (pixbuf_filter, _("Images"));
+       gtk_file_filter_add_pixbuf_formats (pixbuf_filter);
+       gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), pixbuf_filter);
+       
        all_filter = gtk_file_filter_new ();
        gtk_file_filter_set_name (all_filter, _("All Files"));
        gtk_file_filter_add_pattern (all_filter, "*");
        gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), all_filter);
-
+       
        gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (chooser), both_filter);
 
        if (gtk_dialog_run (GTK_DIALOG (chooser)) == GTK_RESPONSE_OK) {
@@ -165,24 +166,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));