[nautilus] window: remove bookmark menu placeholder path from NautilusWindowClass
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] window: remove bookmark menu placeholder path from NautilusWindowClass
- Date: Mon, 9 Jan 2012 22:24:37 +0000 (UTC)
commit cc151a40cebda4ba7d4adc40c702f0210614105f
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Jan 2 00:42:57 2012 +0100
window: remove bookmark menu placeholder path from NautilusWindowClass
It's not used by the only subclass we have now.
src/nautilus-window-bookmarks.c | 3 ++-
src/nautilus-window.c | 3 ---
src/nautilus-window.h | 2 --
3 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/nautilus-window-bookmarks.c b/src/nautilus-window-bookmarks.c
index 48dc9c9..f8148b1 100644
--- a/src/nautilus-window-bookmarks.c
+++ b/src/nautilus-window-bookmarks.c
@@ -42,6 +42,7 @@
#include <glib/gi18n.h>
#define MENU_ITEM_MAX_WIDTH_CHARS 32
+#define MENU_PATH_BOOKMARKS_PLACEHOLDER "/MenuBar/Other Menus/Bookmarks/Bookmarks Placeholder"
static GtkWindow *bookmarks_window = NULL;
@@ -391,7 +392,7 @@ update_bookmarks (NautilusWindow *window)
nautilus_menus_append_bookmark_to_menu
(NAUTILUS_WINDOW (window),
bookmark,
- NAUTILUS_WINDOW_GET_CLASS (window)->bookmarks_placeholder,
+ MENU_PATH_BOOKMARKS_PLACEHOLDER,
"dynamic",
index,
window->details->bookmarks_action_group,
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 2aa3515..3cd661c 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -83,8 +83,6 @@
#define MAX_TITLE_LENGTH 180
-#define MENU_PATH_BOOKMARKS_PLACEHOLDER "/MenuBar/Other Menus/Bookmarks/Bookmarks Placeholder"
-
/* Forward and back buttons on the mouse */
static gboolean mouse_extra_buttons = TRUE;
static int mouse_forward_button = 9;
@@ -1999,7 +1997,6 @@ nautilus_window_class_init (NautilusWindowClass *class)
wclass->window_state_event = nautilus_window_state_event;
wclass->button_press_event = nautilus_window_button_press_event;
- class->bookmarks_placeholder = MENU_PATH_BOOKMARKS_PLACEHOLDER;
class->get_icon = real_get_icon;
class->close = real_window_close;
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index e48f251..3471b61 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -76,8 +76,6 @@ typedef struct NautilusWindowDetails NautilusWindowDetails;
typedef struct {
GtkWindowClass parent_spot;
- const char *bookmarks_placeholder;
-
/* Function pointers for overriding, without corresponding signals */
void (* sync_title) (NautilusWindow *window,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]