Commit 3ae61117 authored by Darin Adler's avatar Darin Adler

Remove some help sidebar panel remnants.

	* libnautilus-private/nautilus-global-preferences.c:
	(nautilus_global_preferences_init):
	* libnautilus-private/nautilus-sidebar-functions.c:
	(sidebar_panel_make_preference_key):
	* libnautilus-private/nautilus-sidebar-functions.h:
	Remove some help sidebar panel remnants.
parent 6b5cf550
2002-01-03 Darin Adler <darin@bentspoon.com>
* libnautilus-private/nautilus-global-preferences.c:
(nautilus_global_preferences_init):
* libnautilus-private/nautilus-sidebar-functions.c:
(sidebar_panel_make_preference_key):
* libnautilus-private/nautilus-sidebar-functions.h:
Remove some help sidebar panel remnants.
2002-01-03 Michael Meeks <michael@ximian.com>
* components/image-viewer/io-png.c
(image_save): disable png stuff.
2001-12-21 Michael Meeks <michael@ximian.com>
2001-01-03 Michael Meeks <michael@ximian.com>
* configure.in: bump requirements on bonobo to get
something that works well.
......
......@@ -57,9 +57,13 @@ static gpointer default_smooth_font_callback (int user_level);
static gpointer default_home_location_callback (int user_level);
static gpointer default_default_folder_viewer_callback (int user_level);
#if GNOME2_CONVERSION_COMPLETE
static const char *default_smooth_font_auto_value;
static const char *icon_view_smooth_font_auto_value;
#endif
/* An enumeration used for installing type specific preferences defaults. */
typedef enum
{
......@@ -680,12 +684,6 @@ static const PreferenceDefault preference_defaults[] = {
{ EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) },
{ USER_LEVEL_NONE }
},
{ nautilus_sidebar_help_enabled_preference_name,
PREFERENCE_BOOLEAN,
EEL_USER_LEVEL_INTERMEDIATE,
{ EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) },
{ USER_LEVEL_NONE }
},
{ nautilus_sidebar_history_enabled_preference_name,
PREFERENCE_BOOLEAN,
EEL_USER_LEVEL_INTERMEDIATE,
......@@ -1097,10 +1095,12 @@ nautilus_global_preferences_init (void)
eel_preferences_monitor_directory (SYSTEM_GNOME_VFS_PATH);
/* Set up storage for values accessed in this file */
#if GNOME2_CONVERSION_COMPLETE
eel_preferences_add_auto_string (NAUTILUS_PREFERENCES_ICON_VIEW_SMOOTH_FONT,
&icon_view_smooth_font_auto_value);
eel_preferences_add_auto_string (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT,
&default_smooth_font_auto_value);
#endif
eel_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE,
smooth_graphics_mode_changed_callback,
......
......@@ -29,19 +29,16 @@
#include "nautilus-view-identifier.h"
#include <eel/eel-glib-extensions.h>
#include <eel/eel-string.h>
#include <bonobo-activation/bonobo-activation.h>
#define PREFERENCES_SIDEBAR_PANEL_PREFIX "sidebar-panels"
#define NEWS_PANEL_IID "OAFIID:nautilus_news_view:041601"
#define NOTES_PANEL_IID "OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185"
#define HELP_PANEL_IID "OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234"
#define HISTORY_PANEL_IID "OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb"
#define TREE_PANEL_IID "OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d"
const char nautilus_sidebar_news_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" NEWS_PANEL_IID;
const char nautilus_sidebar_notes_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" NOTES_PANEL_IID;
const char nautilus_sidebar_help_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" HELP_PANEL_IID;
const char nautilus_sidebar_history_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" HISTORY_PANEL_IID;
const char nautilus_sidebar_tree_enabled_preference_name[] = PREFERENCES_SIDEBAR_PANEL_PREFIX "/" TREE_PANEL_IID;
......@@ -50,7 +47,7 @@ sidebar_panel_make_preference_key (const char *panel_iid)
{
g_return_val_if_fail (panel_iid != NULL, NULL);
return g_strdup_printf ("%s/%s", PREFERENCES_SIDEBAR_PANEL_PREFIX, panel_iid);
return g_strconcat (PREFERENCES_SIDEBAR_PANEL_PREFIX "/", panel_iid, NULL);
}
static int
......
......@@ -29,7 +29,6 @@
extern const char nautilus_sidebar_news_enabled_preference_name[];
extern const char nautilus_sidebar_notes_enabled_preference_name[];
extern const char nautilus_sidebar_help_enabled_preference_name[];
extern const char nautilus_sidebar_history_enabled_preference_name[];
extern const char nautilus_sidebar_tree_enabled_preference_name[];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment