Yasumichi Akahoshi
yasum****@users*****
2005年 5月 7日 (土) 20:34:29 JST
Index: cxplorer/src/Makefile.in
diff -u cxplorer/src/Makefile.in:1.23 cxplorer/src/Makefile.in:1.24
--- cxplorer/src/Makefile.in:1.23 Sat May 7 03:21:54 2005
+++ cxplorer/src/Makefile.in Sat May 7 20:34:29 2005
@@ -77,6 +77,8 @@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
Index: cxplorer/src/cxplorer-window.c
diff -u cxplorer/src/cxplorer-window.c:1.38 cxplorer/src/cxplorer-window.c:1.39
--- cxplorer/src/cxplorer-window.c:1.38 Sat May 7 03:42:22 2005
+++ cxplorer/src/cxplorer-window.c Sat May 7 20:34:29 2005
@@ -194,17 +194,17 @@
private->client = gconf_client_get_default ();
gconf_client_add_dir (private->client, "/apps/cxp/cxplorer", GCONF_CLIENT_PRELOAD_NONE, NULL);
show_dot_file = gconf_client_get_bool (private->client, "/apps/cxp/cxplorer/ShowDotFile", NULL);
-
- private->profile = cxp_profile_new ("cxplorer", "main");
- private->bookmark = cxp_profile_new ("cxplorer", "bookmark");
- private->sendto = cxp_profile_new ("common", "SendTo");
- filter = cxp_profile_get_string (private->profile, "FilenameFilter");
+ filter = gconf_client_get_string (private->client, "/apps/cxp/cxplorer/FilenameFilter", NULL);
if(filter != NULL)
{
cxp_utils_set_filename_filter (filter);
g_free (filter);
}
+ private->profile = cxp_profile_new ("cxplorer", "main");
+ private->bookmark = cxp_profile_new ("cxplorer", "bookmark");
+ private->sendto = cxp_profile_new ("common", "SendTo");
+
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (self), vbox);
@@ -260,9 +260,9 @@
gtk_paned_pack1 (GTK_PANED (hpaned), dirview, FALSE, FALSE);
gtk_widget_show (dirview);
- preview_text = cxp_profile_get_string (private->profile, "PreviewText");
- preview_binary = cxp_profile_get_string (private->profile, "PreviewBinary");
- preview_dir = cxp_profile_get_string (private->profile, "PreviewDir");
+ preview_text = gconf_client_get_string (private->client, "/apps/cxp/cxplorer/PreviewText", NULL);
+ preview_binary = gconf_client_get_string (private->client, "/apps/cxp/cxplorer/PreviewBinary", NULL);
+ preview_dir = gconf_client_get_string (private->client, "/apps/cxp/cxplorer/PreviewDir", NULL);
right_pane = cxp_right_pane_new ();
cxp_right_pane_set_show_dot_file (CXP_RIGHT_PANE(right_pane), show_dot_file);
g_object_set (right_pane, "preview_text", preview_text,
@@ -617,7 +617,8 @@
GtkWidget *dialog;
- cmd_format = cxp_profile_get_string (private->profile, "AttachCommand");
+ cmd_format = gconf_client_get_string (private->client, "/apps/cxp/cxplorer/AttachCommand", NULL);
+ g_return_if_fail (cmd_format != NULL);
if ((fullpath = cxp_right_pane_get_active_file_name (CXP_RIGHT_PANE(private->right_pane))) != NULL)
{
cmd = g_strdup_printf(cmd_format, fullpath);