gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-24 18:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump GTK+ required version to 2.13.0.

Browse source 
2008-09-04  Cosimo Cecchi  <cosimoc@gnome.org>

	* configure.in: Bump GTK+ required version to 2.13.0.
	* libnautilus-private/nautilus-program-choosing.c:
	(nautilus_launch_application), (nautilus_launch_desktop_file):
	* src/nautilus-connect-server-dialog-main.c: (show_uri):
	Use GdkAppLaunchContext instead of EelAppLaunchContext.
	This also fixes bug #550864.

svn path=/trunk/; revision=14585
This commit is contained in:
Cosimo Cecchi 2008-09-04 17:37:05 +00:00 committed by Cosimo Cecchi
parent bbc5753d0d
commit b99b24f38a
4 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-09-04 Cosimo Cecchi <cosimoc@gnome.org>
* configure.in: Bump GTK+ required version to 2.13.0.
* libnautilus-private/nautilus-program-choosing.c:
(nautilus_launch_application), (nautilus_launch_desktop_file):
* src/nautilus-connect-server-dialog-main.c: (show_uri):
Use GdkAppLaunchContext instead of EelAppLaunchContext.
This also fixes bug #550864.
2008-09-04 Christian Neumair <cneumair@gnome.org>
* libnautilus-private/nautilus-icon-container.c

2
configure.in
View file

@ -11,7 +11,7 @@ m4_define(gnome_minver, 2.14.0)
m4_define(gnome_ui_minver, 2.6.0)
m4_define(orbit_minver, 2.4.0)
m4_define(pango_minver, 1.1.2)
m4_define(gtk_minver, 2.11.6)
m4_define(gtk_minver, 2.13.0)
m4_define(rsvg_minver, 2.0.1)
m4_define(xml_minver, 2.4.7)
m4_define(startup_notification_minver, 0.8)

19
libnautilus-private/nautilus-program-choosing.c
View file

@ -36,7 +36,6 @@
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-preferences.h>
#include <eel/eel-string.h>
#include <eel/eel-app-launch-context.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
@ -153,7 +152,7 @@ nautilus_launch_application (GAppInfo *application,
NautilusFile *file;
gboolean result;
GError *error;
EelAppLaunchContext *launch_context;
GdkAppLaunchContext *launch_context;
NautilusIconInfo *icon;
int count, total;
@ -179,15 +178,15 @@ nautilus_launch_application (GAppInfo *application,
}
locations = g_list_reverse (locations);
launch_context = eel_app_launch_context_new ();
launch_context = gdk_app_launch_context_new ();
if (parent_window)
eel_app_launch_context_set_screen (launch_context,
gtk_window_get_screen (parent_window));
gdk_app_launch_context_set_screen (launch_context,
gtk_window_get_screen (parent_window));
file = NAUTILUS_FILE (files->data);
icon = nautilus_file_get_icon (file, 48, 0);
if (icon) {
eel_app_launch_context_set_icon_name (launch_context,
gdk_app_launch_context_set_icon_name (launch_context,
nautilus_icon_info_get_used_name (icon));
g_object_unref (icon);
}
@ -346,7 +345,7 @@ nautilus_launch_desktop_file (GdkScreen *screen,
int total, count;
GFile *file, *desktop_file;
GDesktopAppInfo *app_info;
EelAppLaunchContext *context;
GdkAppLaunchContext *context;
/* Don't allow command execution from remote locations
* to partially mitigate the security
@ -415,10 +414,10 @@ nautilus_launch_desktop_file (GdkScreen *screen,
}
error = NULL;
context = eel_app_launch_context_new ();
context = gdk_app_launch_context_new ();
/* TODO: Ideally we should accept a timestamp here instead of using GDK_CURRENT_TIME */
eel_app_launch_context_set_timestamp (context, GDK_CURRENT_TIME);
eel_app_launch_context_set_screen (context,
gdk_app_launch_context_set_timestamp (context, GDK_CURRENT_TIME);
gdk_app_launch_context_set_screen (context,
gtk_window_get_screen (parent_window));
if (count == total) {
/* All files are local, so we can use g_app_info_launch () with

8
src/nautilus-connect-server-dialog-main.c
View file

@ -29,12 +29,12 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <libgnome/gnome-program.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnomeui/gnome-authentication-manager.h>
#include <eel/eel-app-launch-context.h>
#include <eel/eel-preferences.h>
#include <eel/eel-stock-dialogs.h>
#include <eel/eel-mount-operation.h>
@ -94,10 +94,10 @@ show_uri (const char *uri,
GtkWidget *widget)
{
GError *error;
EelAppLaunchContext *launch_context;
GdkAppLaunchContext *launch_context;
launch_context = eel_app_launch_context_new ();
eel_app_launch_context_set_screen (launch_context,
launch_context = gdk_app_launch_context_new ();
gdk_app_launch_context_set_screen (launch_context,
gtk_widget_get_screen (widget));
error = NULL;