[gnome-shell] Remove taskpanel

commit a439a58f13a7d5744bfb23e30cef0ef3b7cfd3ca
Author: Jon Nettleton <jon.nettleton@xxxxxxxxx>
Date:   Fri Jul 31 17:40:46 2009 -0400

    Remove taskpanel
    
    The new design doesn't have the task panel at the bottom; remove it.
    
    Signed-off-by: Colin Walters <walters@xxxxxxxxxx>

 configure.ac               |    1 -
 js/ui/main.js              |    1 -
 src/Makefile-taskpanel.am  |   17 --------
 src/Makefile.am            |    1 -
 src/gnome-shell.in         |    4 +-
 src/gnomeshell-taskpanel.c |   90 --------------------------------------------
 src/shell-global.c         |   14 -------
 src/shell-global.h         |    2 -
 8 files changed, 1 insertions(+), 129 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e31698c..571297a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ PKG_CHECK_MODULES(TIDY, clutter-1.0)
 PKG_CHECK_MODULES(BIG, clutter-1.0 gtk+-2.0 librsvg-2.0)
 PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-2.0)
 PKG_CHECK_MODULES(TRAY, gtk+-2.0)
-PKG_CHECK_MODULES(TASKPANEL, libwnck-1.0 dbus-glib-1)
 # We require libgnomeui for generating thumbnails for recent files with 
GnomeThumbnailFactory.
 # We'll switch to using GnomeDesktopThumbnailFactory once the branch of 
gnome-desktop that contains
 # it becomes stable.
diff --git a/js/ui/main.js b/js/ui/main.js
index 603ac39..cf834c9 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -35,7 +35,6 @@ function start() {
     Gio.DesktopAppInfo.set_desktop_env("GNOME");
 
     global.grab_dbus_service();
-    global.start_task_panel();
 
     Tweener.init();
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8bc6bd3..c9ad0d9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,6 @@ include Makefile-tidy.am
 include Makefile-big.am
 include Makefile-gdmuser.am
 include Makefile-tray.am
-include Makefile-taskpanel.am
 
 gnome_shell_cflags =                           \
        $(MUTTER_PLUGIN_CFLAGS)                 \
diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 9622029..12a607f 100644
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -123,19 +123,17 @@ def start_shell():
         top_dir = os.path.dirname(bin_dir)
         plugin = os.path.join(top_dir, 'src', 'libgnome-shell.la')
         typelib_dir = os.path.join(top_dir, "src")
-        taskpanel_dir = os.path.join(top_dir, "src")
         js_dir = os.path.join(top_dir, "js")
         data_dir = os.path.join(top_dir, "data")
     else:
         running_from_source_tree = False
         plugin = 'libgnome-shell'
         js_dir = os.path.join('@pkgdatadir@', 'js')
-        taskpanel_dir = '@libexecdir@'
 
     # Set up environment
     env = dict(os.environ)
     env.update({'GNOME_SHELL_JS'      : '@GJS_JS_DIR@:@GJS_JS_NATIVE_DIR@:' + 
js_dir,
-                'PATH'                : '@MUTTER_BIN_DIR@:' + 
os.environ.get('PATH', '') + ':' + taskpanel_dir,
+                'PATH'                : '@MUTTER_BIN_DIR@:' + 
os.environ.get('PATH', ''),
                 'GNOME_DISABLE_CRASH_DIALOG' : '1'})
 
     if running_from_source_tree:
diff --git a/src/shell-global.c b/src/shell-global.c
index 03ac1e9..2992088 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -760,20 +760,6 @@ shell_global_grab_dbus_service (ShellGlobal *global)
   g_object_unref (bus);
 }
 
-void
-shell_global_start_task_panel (ShellGlobal *global)
-{
-  const char* panel_args[] = {"gnomeshell-taskpanel", SHELL_DBUS_SERVICE, 
NULL};
-  GError *error = NULL;
-
-  if (!g_spawn_async (NULL, (char**)panel_args, NULL, G_SPAWN_SEARCH_PATH, 
NULL,
-                      NULL, NULL, &error)) 
-    {
-      g_critical ("failed to execute %s: %s", panel_args[0], error->message);
-      g_clear_error (&error);
-    }
-}
-
 static void 
 grab_notify (GtkWidget *widget, gboolean was_grabbed, gpointer user_data)
 {
diff --git a/src/shell-global.h b/src/shell-global.h
index 5d2c28d..386afbb 100644
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -48,8 +48,6 @@ MetaScreen *shell_global_get_screen (ShellGlobal  *global);
 
 void shell_global_grab_dbus_service (ShellGlobal *global);
 
-void shell_global_start_task_panel (ShellGlobal *global);
-
 typedef enum {
   SHELL_STAGE_INPUT_MODE_NONREACTIVE,
   SHELL_STAGE_INPUT_MODE_NORMAL,
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list

Want to limit the commits to a few modules? Go to above URL, log in to edit 
your options and select the modules ('topics') you want.