From 769cf77926d58dc75e1f031b15433522ecd8d9a2 Mon Sep 17 00:00:00 2001 From: Claudio Saavedra Date: Wed, 8 Jun 2011 14:37:29 +0300 Subject: Move the save/load accelerators methods to the ephy file utilities Second patch in an attempt to clean up ephy-main.c https://bugzilla.gnome.org/show_bug.cgi?id=652119 --- src/ephy-main.c | 41 ++--------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) (limited to 'src') diff --git a/src/ephy-main.c b/src/ephy-main.c index 5e1a8428b..850b2838d 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -383,43 +383,6 @@ show_error_message (GError **error) gtk_dialog_run (GTK_DIALOG (dialog)); } -static gchar * -get_accels_filename (void) -{ - const char *home; - - home = g_get_home_dir(); - if (!home) - return NULL; - return g_build_filename (home, GNOME_DOT_GNOME, "accels", PACKAGE, NULL); -} - -static void -load_accels (void) -{ - char *filename; - - filename = get_accels_filename (); - if (!filename) - return; - - gtk_accel_map_load (filename); - g_free (filename); -} - -static void -save_accels (void) -{ - char *filename; - - filename = get_accels_filename (); - if (!filename) - return; - - gtk_accel_map_save (filename); - g_free (filename); -} - static void shell_quit_cb (EphyShell *shell, gpointer data) { @@ -689,7 +652,7 @@ main (int argc, } ephy_stock_icons_init (); - load_accels (); + ephy_file_load_accels (); /* Work-around Flash Player crash */ g_setenv ("XLIB_SKIP_ARGB_VISUALS", "1", FALSE); @@ -705,7 +668,7 @@ main (int argc, /* Shutdown */ g_object_unref (ephy_shell); - save_accels (); + ephy_file_save_accels (); ephy_state_save (); ephy_settings_shutdown (); ephy_file_helpers_shutdown (); -- cgit v1.2.3