gnome-session r4706 - in trunk: . capplet

[lucasr svn gnome org]

Author: lucasr
Date: Sun May 25 20:32:44 2008
New Revision: 4706
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4706&view=rev

Log:
2008-05-25  Lucas Rocha  <lucasr gnome org>

	Add support for drag and drop of desktop files on Session Properties
	capplet. #437206, Vincent Untz. Patch from Jared Moore <jaredm gmx com>

	* capplet/commands.c (spc_command_add_app): check if icon is set
	on iter before using default app icon.
	* capplet/ui.c
	(setup_treeview, drag_data_cb, add_from_desktop_file): set drag and
	drop handlers. The treeview now can receive a list of desktop file uris
	from DnD.


Modified:
   trunk/ChangeLog
   trunk/capplet/commands.c
   trunk/capplet/ui.c

Modified: trunk/capplet/commands.c
==============================================================================
--- trunk/capplet/commands.c	(original)
+++ trunk/capplet/commands.c	Sun May 25 20:32:44 2008
@@ -674,7 +674,7 @@
   GKeyFile *keyfile;
   char **argv;
   char *basename, *orig_filename, *filename;
-  char *name, *command, *comment, *description;
+  char *name, *command, *comment, *description, *icon;
   int argc;
   int i = 2;
 
@@ -682,6 +682,7 @@
                       STORE_COL_NAME, &name,
                       STORE_COL_COMMAND, &command,
                       STORE_COL_COMMENT, &comment,
+                      STORE_COL_ICON_NAME, &icon,
                       -1);
 
   g_shell_parse_argv (command, &argc, &argv, NULL);
@@ -716,6 +717,14 @@
   g_key_file_set_string (keyfile, DESKTOP_ENTRY_GROUP,
                          "Exec", command);  
 
+  if (icon == NULL)
+    {
+      icon = g_strdup (STARTUP_APP_ICON);
+    }
+  
+  g_key_file_set_string (keyfile, DESKTOP_ENTRY_GROUP,
+                         "Icon", icon);
+
   if (comment)
     g_key_file_set_string (keyfile, DESKTOP_ENTRY_GROUP,
                            "Comment", comment);  
@@ -737,7 +746,7 @@
 
   gtk_list_store_set (store, iter,
                       STORE_COL_ENABLED, TRUE, 
-                      STORE_COL_ICON_NAME, STARTUP_APP_ICON, 
+                      STORE_COL_ICON_NAME, icon, 
                       STORE_COL_DESKTOP_FILE, desktop_file,
                       STORE_COL_ID, basename, 
                       STORE_COL_ACTIVATABLE, TRUE,
@@ -750,6 +759,7 @@
   g_free (comment);
   g_free (description);
   g_free (basename);
+  g_free (icon);
 }
 
 void

Modified: trunk/capplet/ui.c
==============================================================================
--- trunk/capplet/ui.c	(original)
+++ trunk/capplet/ui.c	Sun May 25 20:32:44 2008
@@ -20,6 +20,7 @@
 
 
 #include <glib/gi18n.h>
+#include <gio/gio.h>
 
 #include <string.h>
 #include <gconf/gconf-client.h>
@@ -330,6 +331,111 @@
     }
 }
 
+
+static gboolean
+add_from_desktop_file (GtkTreeView *treeview, char *filename) 
+{
+  EggDesktopFile *desktop_file;
+  gboolean success = FALSE;
+
+  /* Assume that the file is local */
+  GFile *file = g_file_new_for_uri (filename);
+  gchar *path = g_file_get_path (file);
+
+  if (path != NULL)
+    {
+      desktop_file = egg_desktop_file_new (path, NULL);
+
+      if (desktop_file != NULL)
+        {
+          GtkTreeIter iter;
+          GtkTreeModel *model;
+          const char *name;
+          char *comment, *description, *command, *icon;
+
+          model = gtk_tree_view_get_model (treeview);
+
+          gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+
+          name = egg_desktop_file_get_name (desktop_file);
+
+          comment = egg_desktop_file_get_locale_string (desktop_file, 
+                                                        EGG_DESKTOP_FILE_KEY_COMMENT,
+                                                        NULL, NULL);
+          if (comment == NULL)
+            comment = egg_desktop_file_get_string (desktop_file, 
+                                                   EGG_DESKTOP_FILE_KEY_COMMENT,
+                                                   NULL);
+
+          description = spc_command_get_app_description (name, comment);
+
+          command = egg_desktop_file_get_string (desktop_file,
+                                                 EGG_DESKTOP_FILE_KEY_EXEC,
+                                                 NULL);
+
+          icon = egg_desktop_file_get_string (desktop_file,
+                                              EGG_DESKTOP_FILE_KEY_ICON,
+                                              NULL);
+
+          if (name && comment && description && command)
+            {
+              gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                                  STORE_COL_DESCRIPTION, description,
+                                  STORE_COL_NAME, name,
+                                  STORE_COL_COMMAND, command,
+                                  STORE_COL_COMMENT, comment,
+                                  STORE_COL_ICON_NAME, icon,
+                                  STORE_COL_DESKTOP_FILE, desktop_file,
+                                  -1);
+
+              spc_command_add_app (GTK_LIST_STORE (model), &iter);
+              success = TRUE;
+            }
+
+          g_free (comment);
+          g_free (description);
+          g_free (command);
+          g_free (icon);
+          egg_desktop_file_free (desktop_file);
+        }
+    }
+
+  g_free (path);
+  return success;
+}
+
+static gboolean 
+drag_data_cb (GtkWidget        *widget,
+              GdkDragContext   *drag_context,
+              gint              x,
+              gint              y,
+              GtkSelectionData *data,
+              guint             info,
+              guint             time,
+              gpointer          user_data)
+{
+  gboolean dnd_success = FALSE;
+
+  if ((data != NULL) && (data->length >= 0))
+    {
+      gchar **filenames = g_strsplit ((gchar *)data->data, "\r\n", 0);
+      int i;
+
+      for (i = 0; filenames[i] && filenames[i][0]; i++)
+        {
+          /* Return success if at least one file succeeded */
+          gboolean file_success = 
+            add_from_desktop_file (GTK_TREE_VIEW (widget), filenames[i]);
+          dnd_success = dnd_success || file_success;
+        }
+
+      g_strfreev (filenames);
+    }
+
+  gtk_drag_finish (drag_context, dnd_success, FALSE, time);
+  return TRUE;
+}
+
 static void
 setup_treeview (GtkTreeView *treeview, GladeXML *xml)
 {
@@ -338,6 +444,8 @@
   GtkTreeSelection *selection;
   GtkTreeViewColumn *column;
 
+  static const GtkTargetEntry drag_targets[] = { { "text/uri-list", 0, 0 } };
+
   store = spc_command_get_store ();
   gtk_tree_view_set_model (treeview, store);
   gtk_tree_view_set_headers_visible (treeview, FALSE);
@@ -392,6 +500,17 @@
   gtk_tree_view_column_set_sort_column_id (column, STORE_COL_NAME);
   gtk_tree_view_set_search_column (treeview, STORE_COL_NAME);
   gtk_tree_view_set_rules_hint (treeview, TRUE);
+
+  gtk_drag_dest_set (GTK_WIDGET (treeview),
+                     GTK_DEST_DEFAULT_ALL,
+                     drag_targets,
+                     G_N_ELEMENTS (drag_targets),
+                     GDK_ACTION_COPY);
+
+  g_signal_connect (G_OBJECT (treeview),
+                    "drag-data-received",
+                    G_CALLBACK (drag_data_cb),
+                    NULL);
 }
 
 static void