? .deps
? .libs
? skey/.deps
? skey/.libs
? skey/btoe.lo
? skey/libskey.la
? skey/md4.lo
? skey/md5.lo
? skey/sha1.lo
? skey/skey.lo
? skey/skeyutil.lo
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/Makefile.am,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile.am
--- Makefile.am	12 Jan 2006 16:46:59 -0000	1.43
+++ Makefile.am	25 Jul 2006 13:12:51 -0000
@@ -19,12 +19,6 @@ INCLUDES=@TERM_CFLAGS@ \
 
 bin_PROGRAMS=gnome-terminal
 
-EGGFILES=			\
-	eggaccelerators.c	\
-	eggaccelerators.h	\
-	eggcellrendererkeys.h 	\
-	eggcellrendererkeys.c
-
 ## Terminal
 gnome_terminal_SOURCES=				\
 	encoding.c				\
@@ -49,8 +43,7 @@ gnome_terminal_SOURCES=				\
 	terminal-notebook.c			\
 	terminal-notebook.h			\
 	simple-x-font-selector.c		\
-	simple-x-font-selector.h		\
-	$(EGGFILES)
+	simple-x-font-selector.h
 
 gnome_terminal_LDADD= $(EFENCE) @TERM_LIBS@ skey/libskey.la
 
@@ -72,14 +65,8 @@ EXTRA_DIST =				\
 	$(schema_DATA)			\
 	$(schema_in_files)		\
 	$(server_DATA)			\
-	update-from-egg.sh		\
 	terminal-widget-vte.c
 
-
-EGGDIR=$(srcdir)/../../libegg/libegg
-
-regenerate-built-sources:
-	EGGFILES="$(EGGFILES)" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh
 
 serverdir = $(libdir)/bonobo/servers
 server_DATA = gnome-terminal.server
Index: terminal-accels.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/terminal-accels.c,v
retrieving revision 1.33
diff -u -p -r1.33 terminal-accels.c
--- terminal-accels.c	26 Jan 2006 17:38:50 -0000	1.33
+++ terminal-accels.c	25 Jul 2006 13:12:51 -0000
@@ -25,8 +25,6 @@
 #include "terminal.h"
 #include <string.h>
 #include <glade/glade.h>
-#include "eggcellrendererkeys.h"
-#include "eggaccelerators.h"
 
 #define D(x)
 
@@ -661,8 +659,6 @@ binding_from_string (const char      *st
                      guint           *accelerator_key,
                      GdkModifierType *accelerator_mods)
 {
-  EggVirtualModifierType virtual;
-  
   g_return_val_if_fail (accelerator_key != NULL, FALSE);
   
   if (str == NULL || (str && strcmp (str, "disabled") == 0))
@@ -672,20 +668,10 @@ binding_from_string (const char      *st
       return TRUE;
     }
 
-  if (!egg_accelerator_parse_virtual (str, accelerator_key, &virtual))
+  gtk_accelerator_parse (str, accelerator_key, accelerator_mods);
+  if (*accelerator_key == 0 && *accelerator_mods == 0)
     return FALSE;
 
-  egg_keymap_resolve_virtual_modifiers (gdk_keymap_get_default (),
-                                        virtual,
-                                        accelerator_mods);
-
-  /* Be sure the GTK accelerator system will be able to handle this
-   * accelerator. Be sure to allow no-accelerator accels like F1.
-   */
-  if ((*accelerator_mods & gtk_accelerator_get_default_mod_mask ()) == 0 &&
-      *accelerator_mods != 0)
-    return FALSE;
-  
   if (*accelerator_key == 0)
     return FALSE;
   else
@@ -831,7 +817,7 @@ accel_set_func (GtkTreeViewColumn *tree_
     g_object_set (G_OBJECT (cell),
 		  "visible", TRUE,
 		  "accel_key", ke->gconf_keyval,
-		  "accel_mask", ke->gconf_mask,
+		  "accel_mods", ke->gconf_mask,
 		  NULL);
 }
 
@@ -985,7 +971,7 @@ accel_edited_callback (GtkCellRendererTe
           GtkWidget *dialog;
           char *name;
 
-          name = egg_virtual_accelerator_name (keyval, mask);
+          name = gtk_accelerator_name (keyval, mask);
 
           dialog =
             gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
@@ -1001,9 +987,10 @@ accel_edited_callback (GtkCellRendererTe
           gtk_widget_destroy (dialog);
 
           /* set it back to its previous value. */
-          egg_cell_renderer_keys_set_accelerator (EGG_CELL_RENDERER_KEYS (cell),
-						  ke->gconf_keyval,
-						  ke->gconf_mask);
+          g_object_set (G_OBJECT (cell),
+                        "accel_key", ke->gconf_keyval,
+                        "accel_mods", ke->gconf_mask,
+                        NULL);
           gtk_tree_path_free (path);
 
           return;
@@ -1211,17 +1198,14 @@ terminal_edit_keys_dialog_new (GtkWindow
   gtk_tree_view_column_set_sort_column_id (column, ACTION_COLUMN);
 
   /* Column 2 */
-  cell_renderer = g_object_new (EGG_TYPE_CELL_RENDERER_KEYS,
+  cell_renderer = g_object_new (GTK_TYPE_CELL_RENDERER_ACCEL,
 				"editable", TRUE,
-				"accel_mode", EGG_CELL_RENDERER_KEYS_MODE_GTK,
+				"accel_mode", GTK_CELL_RENDERER_ACCEL_MODE_GTK,
 				NULL);
   g_signal_connect (G_OBJECT (cell_renderer), "keys_edited",
                     G_CALLBACK (accel_edited_callback),
                     w);
   
-  g_object_set (G_OBJECT (cell_renderer),
-                "editable", TRUE,
-                NULL);
   column = gtk_tree_view_column_new ();
   gtk_tree_view_column_set_title (column, _("Shortcut _Key"));
   gtk_tree_view_column_pack_start (column, cell_renderer, TRUE);
