Commit 2eca9880 authored by Glynn Foster's avatar Glynn Foster Committed by Glynn Foster

Remove old cruft that that was added during the war years. We don't need

2002-01-10  Glynn Foster  <glynn.foster@sun.com>

	* Makefile.am, main.c, panel.c, session.c: Remove old cruft that
	that was added during the war years. We don't need it now.
parent 71165549
2002-01-10 Glynn Foster <glynn.foster@sun.com>
* Makefile.am, main.c, panel.c, session.c: Remove old cruft that
that was added during the war years. We don't need it now.
2002-01-10 Glynn Foster <glynn.foster@sun.com>
* main.c, panel-widget.c, panel.c, panel.h, session.c, session.h:
......
......@@ -5,7 +5,7 @@ NULL =
#SUBDIRS =
EXTRA_SUBDIRS = config help
EXTRA_SUBDIRS = help
INCLUDES = \
-I. \
......@@ -22,7 +22,6 @@ INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNOME_DATADIR=\""$(datadir)"\" \
-DGLADEDIR=\""$(datadir)/gnome/panel"\" \
-DGLOBAL_CONFDIR=\""$(sysconfdir)/gnome/panel-config"\" \
-DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
......
[Applet_1]
id=Menu
parameters=.
main_menu_flags=-1
global_main=true
old_style_main=false
custom_icon=false
custom_icon_file=
position=0
panel=0
unique_panel_id=10000001
right_stick=false
[Applet_2]
Conditional=screen_width >= 640
id=Launcher
parameters=gnome/apps/gnome-help.desktop
position=12
panel=0
unique_panel_id=10000001
right_stick=false
[Applet_3]
Conditional=screen_width >= 640
id=Launcher
parameters=gnome/apps/System/gnome-terminal.desktop
position=13
panel=0
unique_panel_id=10000001
right_stick=false
[Applet_4]
Conditional=screen_width >= 640
id=Launcher
parameters=gnome/apps/Settings/gnomecc.desktop
position=14
panel=0
unique_panel_id=10000001
right_stick=false
[Applet_5]
Conditional=screen_width >= 640
id=Launcher
parameters:Conditional={exists '/etc/X11/applnk/Internet/mozilla.desktop'}/etc/X11/applnk/Internet/mozilla.desktop{exists 'gnome/apps/Internet/mozilla.desktop'}gnome/apps/Internet/mozilla.desktop{exists 'gnome/apps/Internet/Mozilla.desktop'}gnome/apps/Internet/Mozilla.desktop{true}gnome/apps/Internet/Netscape.desktop
position=15
panel=0
unique_panel_id=10000001
right_stick=false
[Applet_6]
id=Extern
goad_id=tasklist_applet
position=1000
panel=0
unique_panel_id=10000001
right_stick=true
[Applet_7]
Conditional=screen_width >= 640
id=Extern
goad_id=fish_applet
position=1001
panel=0
unique_panel_id=10000001
right_stick=true
[Applet_8]
id=Status
position=1002
panel=0
unique_panel_id=10000001
right_stick=true
[Applet_9]
id=Extern
goad_id=deskguide_applet
position=1000
panel=1
unique_panel_id=10000002
right_stick=true
[Applet_10]
id=Extern
goad_id=gen_util_mailcheck
position=1001
panel=1
unique_panel_id=10000002
right_stick=true
[Applet_11]
Conditional=have battery
id=Extern
goad_id=battery_applet
position=1002
panel=1
unique_panel_id=10000002
right_stick=true
......@@ -215,7 +215,6 @@ main(int argc, char **argv)
if (profile_name == NULL) {
/* FIXME: Do this properly. just a temporary hack */
printf ("Couldn't find profile! - Loading up default . . .\n");
session_set_current_profile ("default");
} else {
session_set_current_profile (profile_name);
......
......@@ -1871,8 +1871,6 @@ panel_session_init_global_config (void)
list = panel_gconf_all_global_entries ();
printf ("Loading up global preferences . . .\n");
for (li = list; li != NULL ; li = li->next) {
GConfEntry *entry;
GConfValue *value;
......@@ -1935,7 +1933,7 @@ panel_session_init_global_config (void)
gconf_value_get_bool (value);
else if (!strcmp (key, "auto-update-menus"))
g_warning ("\nGman: So guys, are we actually gonne do something with this in some sort of GNOME 2.0 timeframe?\n");
;
else if (!strcmp (key, "highlight-launchers-on-mouseover"))
global_config.highlight_when_over =
......@@ -2213,7 +2211,6 @@ panel_session_init_panels(void)
if (panel_gconf_dir_exists (panel_profile_key) == FALSE) {
/* FIXME: We need to resort to another fallback default panel config
and do some sort of check for screen sizes */
printf ("We are loading from a default setup - no current profile detected\n");
use_default = TRUE;
panel_default_profile = "medium";
g_free (panel_profile_key);
......
......@@ -318,6 +318,7 @@ panel_quit (void)
GNOME_INTERACT_ANY, 0, 1);
}
#ifdef FIXME
static gboolean
is_among_users (const char *username, const char *users)
{
......@@ -380,6 +381,7 @@ load_system_wide (void)
gnome_config_pop_prefix ();
}
#endif
void session_load (void) {
/* FIXME : We still have to load up system preferences
......
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