Commit 7f2275a9 authored by Jiri (George) Lebl's avatar Jiri (George) Lebl Committed by George Lebl

a few fixes, dumped the params field

Mon Mar 16 17:26:03 1998  George Lebl  <jirka@5z.com>

        * launcher.c: a few fixes, dumped the params field

        * panel.c: need to pause a second to make mtimes
          different for gnome-config to work with two
          programs writing to the same section at the same
          time .. bad bad bad ... gnome-config is broke
parent ac58ff52
Mon Mar 16 17:26:03 1998 George Lebl <jirka@5z.com>
* launcher.c: a few fixes, dumped the params field
* panel.c: need to pause a second to make mtimes
different for gnome-config to work with two
programs writing to the same section at the same
time .. bad bad bad ... gnome-config is broke
Sun Mar 15 23:53:47 1998 George Lebl <jirka@5z.com>
* launcher.c: port to corba, acts like mc should,
......
Mon Mar 16 17:26:03 1998 George Lebl <jirka@5z.com>
* launcher.c: a few fixes, dumped the params field
* panel.c: need to pause a second to make mtimes
different for gnome-config to work with two
programs writing to the same section at the same
time .. bad bad bad ... gnome-config is broke
Sun Mar 15 23:53:47 1998 George Lebl <jirka@5z.com>
* launcher.c: port to corba, acts like mc should,
......
......@@ -37,7 +37,6 @@ typedef struct {
GtkWidget *button;
gint signal_click_tag;
GnomeDesktopEntry *dentry;
char *params;
} Launcher;
typedef struct {
......@@ -78,7 +77,6 @@ static void
free_user_data(GtkWidget *widget, gpointer data)
{
Launcher *launcher = gtk_object_get_user_data(GTK_OBJECT(widget));
g_free(launcher->params);
gnome_desktop_entry_free(launcher->dentry);
g_free(launcher);
}
......@@ -145,9 +143,6 @@ create_launcher (GtkWidget *window, char *parameters)
gtk_object_set_user_data(GTK_OBJECT(launcher->button), launcher);
/* The .desktop path is stored in the params field */
launcher->params = g_strdup(parameters);
launcher->dentry = dentry;
launcher->applet_id = -1;
......@@ -253,9 +248,6 @@ properties_ok_callback(GtkWidget *widget, gpointer data)
/* FIXME: should update the button and pixmap */
g_free(prop->launcher->params);
prop->launcher->params=g_strdup(dentry->location);
/*FIXME: CORBAize*/
/*cmd.cmd = PANEL_CMD_SET_TOOLTIP;
cmd.params.set_tooltip.applet = prop->launcher->button;
......@@ -381,7 +373,7 @@ properties(GtkWidget *widget)
Launcher *launcher;
launcher = gtk_object_get_user_data(GTK_OBJECT(widget));
path = launcher->params;
path = launcher->dentry->location;
dentry = gnome_desktop_entry_load(path);
if (!dentry) {
......@@ -414,7 +406,8 @@ session_save(int id, const char *cfgpath, const char *globcfgpath)
query = g_copy_strings(cfgpath,"path",NULL);
puts(query);
gnome_config_set_string(query,launcher->params);
gnome_config_set_string(query,launcher->dentry->location);
puts(launcher->dentry->location);
g_free(query);
query = g_copy_strings(globcfgpath,CONFIG_TAG,"/count",NULL);
......@@ -503,7 +496,7 @@ start_new_launcher(const char *path)
launcher_count++;
/*FIXME: corbaize*/
/*dentry = gnome_desktop_entry_load(launcher->params);
/*dentry = gnome_desktop_entry_load(launcher->dentry->location);
cmd.cmd = PANEL_CMD_SET_TOOLTIP;
cmd.params.set_tooltip.applet = launcher->button;
......
......@@ -139,9 +139,18 @@ save_applet_configuration(gpointer data, gpointer user_data)
gnome_config_set_string(fullpath, info->params);
g_free(fullpath);
/*sync before the applet does it's stuff*/
gnome_config_sync();
/*FIXME:????????????: next time we do sync it's gonna
ignore whatever was written to our sections by other
programs ... whoops ... needs to be fixed in
gnome-config!*/
/*have the applet do it's own session saving*/
send_applet_session_save(info->id,(*num)-2,path,
panel_cfg_path);
/*FIXME: related to above FIXME*/
sleep(1);
} else {
fullpath = g_copy_strings(path,"id",NULL);
gnome_config_set_string(fullpath, info->id);
......
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