Yasumichi Akahoshi
yasum****@users*****
2005年 5月 18日 (水) 00:42:07 JST
Index: cxplorer/src/Makefile.am
diff -u cxplorer/src/Makefile.am:1.20 cxplorer/src/Makefile.am:1.21
--- cxplorer/src/Makefile.am:1.20 Thu May 12 02:57:58 2005
+++ cxplorer/src/Makefile.am Wed May 18 00:42:06 2005
@@ -5,8 +5,7 @@
## Please disable it in the Anjuta project configuration
INCLUDES = \
- $(CXP_CFLAGS) \
- $(GCONF_CFLAGS)
+ $(CXP_CFLAGS)
AM_CFLAGS =\
-Wall\
@@ -31,5 +30,4 @@
cxplorer_LDADD = \
$(CXP_LIBS) \
- $(GCONF_LIBS) \
$(MAGIC_LIB)
Index: cxplorer/src/Makefile.in
diff -u cxplorer/src/Makefile.in:1.26 cxplorer/src/Makefile.in:1.27
--- cxplorer/src/Makefile.in:1.26 Sun May 15 01:22:28 2005
+++ cxplorer/src/Makefile.in Wed May 18 00:42:06 2005
@@ -54,8 +54,7 @@
cxp-right-pane.$(OBJEXT) cxplorer-window.$(OBJEXT)
cxplorer_OBJECTS = $(am_cxplorer_OBJECTS)
am__DEPENDENCIES_1 =
-cxplorer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+cxplorer_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -94,8 +93,6 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
@@ -189,8 +186,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
INCLUDES = \
- $(CXP_CFLAGS) \
- $(GCONF_CFLAGS)
+ $(CXP_CFLAGS)
AM_CFLAGS = \
-Wall\
@@ -212,7 +208,6 @@
cxplorer_LDFLAGS =
cxplorer_LDADD = \
$(CXP_LIBS) \
- $(GCONF_LIBS) \
$(MAGIC_LIB)
all: all-am
Index: cxplorer/src/cxplorer-window.c
diff -u cxplorer/src/cxplorer-window.c:1.52 cxplorer/src/cxplorer-window.c:1.53
--- cxplorer/src/cxplorer-window.c:1.52 Tue May 17 17:53:14 2005
+++ cxplorer/src/cxplorer-window.c Wed May 18 00:42:06 2005
@@ -109,6 +109,7 @@
static void cxplorer_window_go_up_action (GtkWidget *widget, gpointer user_data);
static void cxplorer_window_go_home_action (GtkWidget *widget, gpointer user_data);
static void cxplorer_window_bookmark_add_action (GtkWidget *widget, gpointer user_data);
+static void cxplorer_window_bookmark_edit_action (GtkWidget *widget, gpointer user_data);
static void cxplorer_window_about_action (GtkWidget *widget, gpointer user_data);
static void cxplorer_window_sendto_activate (GtkWidget *widget, gpointer user_data);
@@ -142,6 +143,7 @@
/* Move menu */
{"BookmarkAction", NULL, N_("_Bookmark"), NULL, NULL, NULL},
{"BookmarkAddAction", "gtk-add", N_("_Add Bookmark..."), NULL, NULL, G_CALLBACK(cxplorer_window_bookmark_add_action)},
+ {"BookmarkEditAction", NULL, N_("_Edit Bookmark..."), NULL, NULL, G_CALLBACK(cxplorer_window_bookmark_edit_action)},
{"UpAction", "gtk-go-up", N_("_Up"), "<Alt>Up", NULL, G_CALLBACK(cxplorer_window_go_up_action)},
{"HomeAct", "gtk-home", N_("_Home"), "<Alt>Home", NULL, G_CALLBACK(cxplorer_window_go_home_action)},
/* Help menu */
@@ -872,6 +874,17 @@
g_free (cur_dir);
}
+static void cxplorer_window_bookmark_edit_action (GtkWidget *widget, gpointer user_data)
+{
+ CxplorerWindow *self = CXPLORER_WINDOW (user_data);
+ CxplorerWindowPrivate *private = CXPLORER_WINDOW_GET_PRIVATE (self);
+ GtkWidget *window;
+
+ window = cxp_gconf_pair_editor_new (GTK_WINDOW(self), _("Edit Bookmark"), "/apps/cxp/cxplorer/bookmark", _("Caption"), _("Directory"));
+ gtk_widget_show (window);
+ gtk_window_set_modal (GTK_WINDOW(window), TRUE);
+}
+
/**
* This function show about dialog when user click "Help->About".
* @param menuitem [in] Pointer to menu item "Help->About".