gnome-panel r11179 - in trunk: . gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: Sun Aug  3 12:27:01 2008
New Revision: 11179
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11179&view=rev

Log:
2008-08-03  Vincent Untz  <vuntz gnome org>

	* panel-menu-items.c: (panel_menu_item_mount_volume): use
	GtkMountOperation
	* panel-mount-operation.[ch]: kill those files
	* Makefile.am: updated

2008-08-03  Vincent Untz  <vuntz gnome org>

	* configure.in: require GTK+ 2.13.1 for GtkMountOperation


Removed:
   trunk/gnome-panel/panel-mount-operation.c
   trunk/gnome-panel/panel-mount-operation.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/Makefile.am
   trunk/gnome-panel/panel-menu-items.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Aug  3 12:27:01 2008
@@ -52,7 +52,7 @@
 GDK_PIXBUF_REQUIRED=2.7.1
 PANGO_REQUIRED=1.15.4
 GLIB_REQUIRED=2.15.6
-GTK_REQUIRED=2.11.3
+GTK_REQUIRED=2.13.1
 LIBGLADE_REQUIRED=2.5.0
 LIBGNOME_REQUIRED=2.13.0
 LIBGNOMEUI_REQUIRED=2.5.4

Modified: trunk/gnome-panel/Makefile.am
==============================================================================
--- trunk/gnome-panel/Makefile.am	(original)
+++ trunk/gnome-panel/Makefile.am	Sun Aug  3 12:27:01 2008
@@ -98,7 +98,6 @@
 	panel-lockdown.c	\
 	panel-addto.c		\
 	panel-ditem-editor.c	\
-	panel-mount-operation.c	\
 	$(NULL)
 
 panel_headers =			\
@@ -146,7 +145,6 @@
 	panel-addto.h		\
 	panel-ditem-editor.h	\
 	panel-icon-names.h	\
-	panel-mount-operation.h	\
 	$(NULL)
 
 gnome_panel_SOURCES =			\

Modified: trunk/gnome-panel/panel-menu-items.c
==============================================================================
--- trunk/gnome-panel/panel-menu-items.c	(original)
+++ trunk/gnome-panel/panel-menu-items.c	Sun Aug  3 12:27:01 2008
@@ -50,7 +50,6 @@
 #include "panel-globals.h"
 #include "panel-icon-names.h"
 #include "panel-lockdown.h"
-#include "panel-mount-operation.h"
 #include "panel-recent.h"
 #include "panel-stock-icons.h"
 #include "panel-util.h"
@@ -626,9 +625,9 @@
 
 	mount_data = g_slice_new (PanelVolumeMountData);
 	mount_data->screen = menuitem_to_screen (menuitem);
-	/*FIXME: kill PanelMountOperation when we can depend on newer GTK+ that
-	 * will have the same feature */
-	mount_data->mount_op = panel_mount_operation_new (NULL);
+	mount_data->mount_op = gtk_mount_operation_new (NULL);
+	gtk_mount_operation_set_screen (GTK_MOUNT_OPERATION (mount_data->mount_op),
+					mount_data->screen);
 
 	g_volume_mount (volume, G_MOUNT_MOUNT_NONE, mount_data->mount_op, NULL,
 			volume_mount_cb, mount_data);