gnome-terminal r2607 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:38:07 2008
New Revision: 2607
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2607&view=rev

Log:
Use GTK_STOCK_EDIT here.


Modified:
   trunk/src/terminal-app.c
   trunk/src/terminal.c

Modified: trunk/src/terminal-app.c
==============================================================================
--- trunk/src/terminal-app.c	(original)
+++ trunk/src/terminal-app.c	Thu May 29 19:38:07 2008
@@ -130,7 +130,6 @@
 static GConfClient *conf = NULL;
 static TerminalApp *global_app = NULL;
 
-#define TERMINAL_STOCK_EDIT "terminal-edit"
 #define PROFILE_LIST_KEY CONF_GLOBAL_PREFIX "/profile_list"
 #define DEFAULT_PROFILE_KEY CONF_GLOBAL_PREFIX "/default_profile"
 
@@ -1346,29 +1345,6 @@
     gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
-static void
-terminal_app_register_stock (void)
-{
-  static gboolean registered = FALSE;
-
-  if (!registered)
-    {
-      GtkIconFactory *factory;
-      GtkIconSet     *icons;
-
-      static GtkStockItem edit_item [] = {
-	{ TERMINAL_STOCK_EDIT, N_("_Edit"), 0, 0, GETTEXT_PACKAGE },
-      };
-
-      icons = gtk_icon_factory_lookup_default (GTK_STOCK_PREFERENCES);
-      factory = gtk_icon_factory_new ();
-      gtk_icon_factory_add (factory, TERMINAL_STOCK_EDIT, icons);
-      gtk_icon_factory_add_default (factory);
-      gtk_stock_add_static (edit_item, 1);
-      registered = TRUE;
-    }
-}
-
 void
 terminal_app_manage_profiles (TerminalApp     *app,
                               GtkWindow       *transient_parent)
@@ -1388,9 +1364,7 @@
       GtkSizeGroup *size_group;
       GtkTreeSelection *selection;
       
-      terminal_app_register_stock ();
-
-      old_transient_parent = NULL;      
+      old_transient_parent = NULL;
       
       app->manage_profiles_dialog =
         gtk_dialog_new_with_buttons (_("Profiles"),
@@ -1469,7 +1443,7 @@
       terminal_util_set_atk_name_description (app->manage_profiles_new_button, NULL,                             
                                               _("Click to open new profile dialog"));
       
-      button = gtk_button_new_from_stock (TERMINAL_STOCK_EDIT);
+      button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
       fix_button_align (button);
       gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
       g_signal_connect (button, "clicked",

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Thu May 29 19:38:07 2008
@@ -78,7 +78,6 @@
 static GSList *pending_new_terminal_events = NULL;
 static gboolean use_factory;
 
-#define TERMINAL_STOCK_EDIT "terminal-edit"
 typedef struct
 {
   char    *startup_id;