Commit a01fab9d authored by Carlos Garcia Campos's avatar Carlos Garcia Campos Committed by Carlos Garcia Campos

Removed

2009-04-08  Carlos Garcia Campos  <carlosgc@gnome.org>

	* configure.ac:
	* cut-n-paste/Makefile.am:
	* cut-n-paste/evmountoperation/*: Removed
	* po/POTFILES.in:
	* shell/Makefile.am:
	* shell/ev-print-operation.c:
	* shell/ev-window.c: (window_open_file_copy_ready_cb),
	(ev_window_cmd_help_contents), (launch_action),
	(launch_external_uri):

	Bump GTK+ requirement to 2.14.

svn path=/trunk/; revision=3584
parent bc88b9f7
2009-04-08 Carlos Garcia Campos <carlosgc@gnome.org>
* configure.ac:
* cut-n-paste/Makefile.am:
* cut-n-paste/evmountoperation/*: Removed
* po/POTFILES.in:
* shell/Makefile.am:
* shell/ev-print-operation.c:
* shell/ev-window.c: (window_open_file_copy_ready_cb),
(ev_window_cmd_help_contents), (launch_action),
(launch_external_uri):
Bump GTK+ requirement to 2.14.
2009-04-08 Carlos Garcia Campos <carlosgc@gnome.org>
* shell/ev-window.c: (window_open_file_copy_ready_cb),
......
......@@ -108,7 +108,7 @@ dnl Check dependencies
# SHELL_LIBS
DBUS_GLIB_REQUIRED=0.70
GTK_REQUIRED=2.12.0
GTK_REQUIRED=2.14.0
GLIB_REQUIRED=2.18.0
KEYRING_REQUIRED=2.22.0
AC_SUBST([GLIB_REQUIRED])
......@@ -590,7 +590,6 @@ backend/pixbuf/Makefile
backend/ps/Makefile
backend/tiff/Makefile
cut-n-paste/Makefile
cut-n-paste/evmountoperation/Makefile
cut-n-paste/gedit-message-area/Makefile
cut-n-paste/gimpcellrenderertoggle/Makefile
cut-n-paste/smclient/Makefile
......
SUBDIRS = zoom-control toolbar-editor totem-screensaver gedit-message-area evmountoperation smclient gimpcellrenderertoggle
SUBDIRS = zoom-control toolbar-editor totem-screensaver gedit-message-area smclient gimpcellrenderertoggle
noinst_LTLIBRARIES = libevmountoperation.la
libevmountoperation_la_SOURCES = \
ev-mount-operation.h \
ev-mount-operation.c
libevmountoperation_la_CFLAGS = \
$(SHELL_CORE_CFLAGS) \
$(WARNING_CFLAGS) \
$(DISABLE_DEPRECATED)
This diff is collapsed.
/* GTK - The GIMP Toolkit
* Copyright (C) Christian Kellner <gicmo@gnome.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __EV_MOUNT_OPERATION_H__
#define __EV_MOUNT_OPERATION_H__
#include <glib.h>
#include <gio/gio.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
#define EV_TYPE_MOUNT_OPERATION (ev_mount_operation_get_type ())
#define EV_MOUNT_OPERATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_MOUNT_OPERATION, EvMountOperation))
#define EV_MOUNT_OPERATION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_MOUNT_OPERATION, EvMountOperationClass))
#define EV_IS_MOUNT_OPERATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_MOUNT_OPERATION))
#define EV_IS_MOUNT_OPERATION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_MOUNT_OPERATION))
#define EV_MOUNT_OPERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EV_TYPE_MOUNT_OPERATION, EvMountOperationClass))
typedef struct EvMountOperation EvMountOperation;
typedef struct EvMountOperationClass EvMountOperationClass;
typedef struct EvMountOperationPrivate EvMountOperationPrivate;
struct EvMountOperation
{
GMountOperation parent_instance;
EvMountOperationPrivate *priv;
};
struct EvMountOperationClass
{
GMountOperationClass parent_class;
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
};
GType ev_mount_operation_get_type (void);
GMountOperation *ev_mount_operation_new (GtkWindow *parent);
gboolean ev_mount_operation_is_showing (EvMountOperation *op);
void ev_mount_operation_set_parent (EvMountOperation *op,
GtkWindow *parent);
GtkWindow * ev_mount_operation_get_parent (EvMountOperation *op);
void ev_mount_operation_set_screen (EvMountOperation *op,
GdkScreen *screen);
GdkScreen *ev_mount_operation_get_screen (EvMountOperation *op);
G_END_DECLS
#endif /* __EV_MOUNT_OPERATION_H__ */
......@@ -17,7 +17,6 @@ backend/ps/ev-spectre.c
backend/tiff/tiff-document.c
libdocument/ev-attachment.c
libdocument/ev-document-factory.c
cut-n-paste/evmountoperation/ev-mount-operation.c
cut-n-paste/smclient/eggdesktopfile.c
cut-n-paste/smclient/eggsmclient.c
cut-n-paste/toolbar-editor/egg-editable-toolbar.c
......
......@@ -8,7 +8,6 @@ INCLUDES= \
-I$(top_srcdir)/cut-n-paste/totem-screensaver/ \
-I$(top_srcdir)/cut-n-paste/gedit-message-area/ \
-I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/ \
-I$(top_srcdir)/cut-n-paste/evmountoperation/ \
-I$(top_srcdir)/cut-n-paste/smclient/ \
-I$(top_srcdir)/libdocument \
-I$(top_builddir)/libdocument \
......@@ -92,7 +91,6 @@ evince_LDADD= \
$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \
$(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la \
$(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la \
$(top_builddir)/cut-n-paste/evmountoperation/libevmountoperation.la \
$(top_builddir)/cut-n-paste/smclient/libsmclient.la \
$(top_builddir)/properties/libevproperties.la \
$(top_builddir)/libdocument/libevdocument.la \
......
......@@ -21,12 +21,7 @@
#include "ev-print-operation.h"
#if GTK_CHECK_VERSION (2, 14, 0)
#include <gtk/gtkunixprint.h>
#else
#include <gtk/gtkprintunixdialog.h>
#endif
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <unistd.h>
......
......@@ -38,11 +38,8 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <gtk/gtk.h>
#if GTK_CHECK_VERSION (2, 14, 0)
#include <gtk/gtkunixprint.h>
#else
#include <gtk/gtkprintunixdialog.h>
#endif
#ifdef WITH_GCONF
#include <gconf/gconf-client.h>
#endif
......@@ -73,7 +70,6 @@
#include "ev-jobs.h"
#include "ev-message-area.h"
#include "ev-metadata-manager.h"
#include "ev-mount-operation.h"
#include "ev-navigation-action.h"
#include "ev-open-recent-action.h"
#include "ev-page-action.h"
......@@ -1692,7 +1688,7 @@ window_open_file_copy_ready_cb (GFile *source,
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED)) {
GMountOperation *operation;
operation = ev_mount_operation_new (GTK_WINDOW (ev_window));
operation = gtk_mount_operation_new (GTK_WINDOW (ev_window));
g_file_mount_enclosing_volume (source,
G_MOUNT_MOUNT_NONE,
operation, NULL,
......@@ -3793,7 +3789,6 @@ ev_window_cmd_view_autoscroll (GtkAction *action, EvWindow *ev_window)
ev_view_autoscroll_start (EV_VIEW (ev_window->priv->view));
}
#if GTK_CHECK_VERSION (2, 14, 0)
static void
ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
{
......@@ -3809,56 +3804,6 @@ ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
g_error_free (error);
}
}
#else /* !GTK_CHECK_VERSION (2, 14, 0) */
static void
ev_window_cmd_help_contents (GtkAction *action, EvWindow *ev_window)
{
GError *error = NULL;
GdkScreen *screen;
char *command;
const char *lang;
char *uri = NULL;
int i;
const char * const * langs = g_get_language_names ();
for (i = 0; langs[i]; i++) {
lang = langs[i];
if (strchr (lang, '.')) {
continue;
}
uri = g_build_filename(GNOMEDATADIR,
"/gnome/help/" PACKAGE,
lang,
"/evince.xml",
NULL);
if (g_file_test (uri, G_FILE_TEST_EXISTS)) {
break;
}
g_free (uri);
uri = NULL;
}
if (uri == NULL) {
g_warning ("Cannot find help");
return;
}
command = g_strconcat ("gnome-help ghelp://", uri, NULL);
g_free (uri);
screen = gtk_widget_get_screen (GTK_WIDGET (ev_window));
gdk_spawn_command_line_on_screen (screen, command, &error);
if (error != NULL) {
g_warning ("%s", error->message);
g_error_free (error);
}
g_free (command);
}
#endif /* GTK_CHECK_VERSION (2, 14, 0) */
static void
ev_window_cmd_leave_fullscreen (GtkAction *action, EvWindow *window)
......@@ -5250,7 +5195,7 @@ launch_action (EvWindow *window, EvLinkAction *action)
GAppInfo *app_info;
GFile *file;
GList file_list = {NULL};
GAppLaunchContext *context = NULL;
GAppLaunchContext *context;
GError *error = NULL;
if (filename == NULL)
......@@ -5281,12 +5226,10 @@ launch_action (EvWindow *window, EvLinkAction *action)
return;
}
#if GTK_CHECK_VERSION (2, 14, 0)
context = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ());
gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (context),
gtk_window_get_screen (GTK_WINDOW (window)));
gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (context), GDK_CURRENT_TIME);
#endif
file_list.data = file;
if (!g_app_info_launch (app_info, &file_list, context, &error)) {
......@@ -5309,17 +5252,13 @@ launch_external_uri (EvWindow *window, EvLinkAction *action)
const gchar *uri = ev_link_action_get_uri (action);
GError *error = NULL;
gboolean ret;
#if GTK_CHECK_VERSION (2, 14, 0)
GAppLaunchContext *context = NULL;
#endif
GAppLaunchContext *context;
#if GTK_CHECK_VERSION (2, 14, 0)
context = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ());
gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (context),
gtk_window_get_screen (GTK_WINDOW (window)));
gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (context),
GDK_CURRENT_TIME);
#endif
if (!g_strstr_len (uri, strlen (uri), "://") &&
!g_str_has_prefix (uri, "mailto:")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment