gimp r28110 - in trunk: . plug-ins/file-uri po-plug-ins

[neo svn gnome org]

Author: neo
Date: Thu Mar  5 19:44:15 2009
New Revision: 28110
URL: http://svn.gnome.org/viewvc/gimp?rev=28110&view=rev

Log:
2009-03-05  Sven Neumann  <sven gimp org>

	* plug-ins/file-uri/Makefile.am
	* plug-ins/file-uri/gimpmountoperation.[ch]: removed these 
files.

	* plug-ins/file-uri/uri-backend-gvfs.c: use GtkMountOperation
	instead of our copy of this widget.



Removed:
   trunk/plug-ins/file-uri/gimpmountoperation.c
   trunk/plug-ins/file-uri/gimpmountoperation.h
Modified:
   trunk/ChangeLog
   trunk/plug-ins/file-uri/Makefile.am
   trunk/plug-ins/file-uri/uri-backend-gvfs.c
   trunk/po-plug-ins/ChangeLog
   trunk/po-plug-ins/POTFILES.in

Modified: trunk/plug-ins/file-uri/Makefile.am
==============================================================================
--- trunk/plug-ins/file-uri/Makefile.am	(original)
+++ trunk/plug-ins/file-uri/Makefile.am	Thu Mar  5 19:44:15 2009
@@ -19,7 +19,7 @@
 libexec_PROGRAMS = file-uri
 
 if HAVE_GVFS
-backend_sources = gimpmountoperation.c gimpmountoperation.h uri-backend-gvfs.c
+backend_sources = uri-backend-gvfs.c
 backend_cflags = $(GIO_CFLAGS)
 backend_libs = $(GIO_LIBS)
 else

Modified: trunk/plug-ins/file-uri/uri-backend-gvfs.c
==============================================================================
--- trunk/plug-ins/file-uri/uri-backend-gvfs.c	(original)
+++ trunk/plug-ins/file-uri/uri-backend-gvfs.c	Thu Mar  5 19:44:15 2009
@@ -27,7 +27,6 @@
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
-#include "gimpmountoperation.h"
 #include "uri-backend.h"
 
 #include "libgimp/stdplugins-intl.h"
@@ -254,7 +253,7 @@
 mount_enclosing_volume (GFile   *file,
                         GError **error)
 {
-  GMountOperation *operation = gimp_mount_operation_new (NULL);
+  GMountOperation *operation = gtk_mount_operation_new (NULL);
 
   g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE,
                                  operation,

Modified: trunk/po-plug-ins/POTFILES.in
==============================================================================
--- trunk/po-plug-ins/POTFILES.in	(original)
+++ trunk/po-plug-ins/POTFILES.in	Thu Mar  5 19:44:15 2009
@@ -171,7 +171,6 @@
 plug-ins/file-psd/psd-util.c
 plug-ins/file-psd/psd.c
 plug-ins/file-sgi/sgi.c
-plug-ins/file-uri/gimpmountoperation.c
 plug-ins/file-uri/uri-backend-gnomevfs.c
 plug-ins/file-uri/uri-backend-gvfs.c
 plug-ins/file-uri/uri-backend-libcurl.c