Commit b192a5a6 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Set desktop env for GAppInfo

2008-01-04  Alexander Larsson  <alexl@redhat.com>

        * configure.in:
        * src/nautilus-main.c:
	Set desktop env for GAppInfo
	
        * libnautilus-private/nautilus-open-with-dialog.c:
	Filter out apps that don't take file args from
	open with list.


svn path=/trunk/; revision=13558
parent 04c3d83b
2008-01-04 Alexander Larsson <alexl@redhat.com>
* configure.in:
* src/nautilus-main.c:
Set desktop env for GAppInfo
* libnautilus-private/nautilus-open-with-dialog.c:
Filter out apps that don't take file args from
open with list.
2008-01-04 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations.c:
......
......@@ -92,6 +92,7 @@ PKG_CHECK_MODULES(ALL, [
eel-2.0 >= eel_minver
glib-2.0 >= glib_minver
gnome-desktop-2.0 >= gnome_desktop_minver
gio-unix-2.0
gio-2.0
ORBit-2.0 >= orbit_minver
pango >= pango_minver
......@@ -402,7 +403,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`"
AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires")
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gio-2.0 $EXTRA_CORE_MODULES"
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gio-2.0 gio-unix-2.0 $EXTRA_CORE_MODULES"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
AC_SUBST(CORE_CFLAGS)
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
......
......@@ -607,6 +607,10 @@ nautilus_open_with_dialog_add_items_idle (NautilusOpenWithDialog *dialog)
GtkTreeIter iter;
GtkTreePath *path;
if (!g_app_info_supports_uris (app) &&
!g_app_info_supports_files (app))
continue;
gtk_list_store_append (dialog->details->program_list_store, &iter);
gtk_list_store_set (dialog->details->program_list_store, &iter,
COLUMN_APP_INFO, app,
......
......@@ -47,6 +47,7 @@
#include <gtk/gtksignal.h>
#include <gdk/gdk.h>
#include <glib/gi18n.h>
#include <gio/gdesktopappinfo.h>
#include <libgnome/gnome-init.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnomeui/gnome-client.h>
......@@ -411,6 +412,9 @@ main (int argc, char *argv[])
setlocale (LC_ALL, "");
/* This will be done by gtk+ later, but for now, force it to GNOME */
g_desktop_app_info_set_desktop_env ("GNOME");
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger ();
}
......
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