Commit 5e239e15 authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Mark McLoughlin

kill PanelAppletShell::saveYourself. We're not going with session based

2001-12-14  Mark McLoughlin  <mark@skynet.ie>

        * GNOME_Panel.idl: kill PanelAppletShell::saveYourself.
        We're not going with session based preferences for applets.

2001-12-14  Mark McLoughlin  <mark@skynet.ie>

        * panel-applet-frame.[ch]:
        (panel_applet_frame_save_session): kill

        * session.c: (save_applet_configuration): upd.

2001-12-14  Mark McLoughlin  <mark@skynet.ie>

        * panel-applet-shell.c:
        (impl_PanelAppletShell_saveYourself): kill.
        (panel_applet_shell_class_init): upd.

        * panel-applet.[ch], panel-applet-private.h:
        (panel_applet_save_yourself): kill.
        (panel_applet_class_init): kill "save_yuorself" signal.
parent 0a6ebd41
2001-12-14 Mark McLoughlin <mark@skynet.ie>
* panel-applet-frame.[ch]:
(panel_applet_frame_save_session): kill
* session.c: (save_applet_configuration): upd.
2001-12-14 Mark McLoughlin <mark@skynet.ie>
* panel-applet-frame.[ch], panel-shell.[ch]:
......
/*
* panel-applet-frame.c:
* panel-applet-frame.h:
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
* Copyright (C) 2001 Sun Microsystems, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* Copyright 2001 Sun Microsystems, Inc.
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
*/
#include <libbonoboui.h>
......@@ -120,37 +135,6 @@ panel_applet_frame_save_position (PanelAppletFrame *frame)
g_free (temp_key);
}
void
panel_applet_frame_save_session (PanelAppletFrame *frame)
{
CORBA_Environment env;
gchar *session_key;
gchar *global_key;
gchar *private_key;
CORBA_exception_init (&env);
session_key = panel_gconf_get_session_key ();
if (!session_key)
return;
global_key = g_strdup_printf ("%s/applets/%s", session_key, frame->priv->iid);
private_key = g_strdup_printf ("%s/applets/%s", session_key, frame->priv->unique_key);
GNOME_Vertigo_PanelAppletShell_saveYourself (frame->priv->applet_shell,
global_key,
private_key,
&env);
if (BONOBO_EX (&env))
g_warning (G_STRLOC " : exception return from saveYourself '%s'",
BONOBO_EX_REPOID (&env));
g_free (global_key);
g_free (private_key);
CORBA_exception_free (&env);
}
void
panel_applet_frame_get_expand_flags (PanelAppletFrame *frame,
gboolean *expand_major,
......
/*
* panel-applet-frame.h:
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
* Copyright (C) 2001 Sun Microsystems, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* Copyright 2001 Sun Microsystems, Inc.
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
*/
#ifndef __PANEL_APPLET_CONTROL_H__
#define __PANEL_APPLET_CONTROL_H__
#ifndef __PANEL_APPLET_FRAME_H__
#define __PANEL_APPLET_FRAME_H__
#include <gtk/gtkeventbox.h>
......@@ -70,12 +85,10 @@ void panel_applet_frame_clear_background (PanelAppletFrame *frame)
void panel_applet_frame_save_position (PanelAppletFrame *frame);
void panel_applet_frame_save_session (PanelAppletFrame *frame);
void panel_applet_frame_get_expand_flags (PanelAppletFrame *frame,
gboolean *expand_major,
gboolean *expand_minor);
G_END_DECLS
#endif /* __PANEL_APPLET_CONTROL_H__ */
#endif /* __PANEL_APPLET_FRAME_H__ */
......@@ -275,7 +275,9 @@ save_applet_configuration(AppletInfo *info)
switch(info->type) {
case APPLET_BONOBO:
panel_applet_frame_save_session (PANEL_APPLET_FRAME (info->data));
/*
* No session saving for applets.
*/
break;
case APPLET_DRAWER:
{
......
2001-12-14 Mark McLoughlin <mark@skynet.ie>
* GNOME_Panel.idl: kill PanelAppletShell::saveYourself.
We're not going with session based preferences for applets.
2001-12-14 Mark McLoughlin <mark@skynet.ie>
* GNOME_Panel.idl: move to our reserved GNOME_Vertigo
......
......@@ -57,14 +57,6 @@ module Vertigo {
interface PanelAppletShell : Bonobo::Unknown {
/*
* GNOME::PanelAppletShell::saveYourself
* @global_key: path to save global applet preferences
* @private_key: path to save per-applet data settings
*/
void saveYourself (in string global_key,
in string private_key);
/*
* GNOME::PanelAppletShell::getExpandFlags
* @expand_major: Whether to expand the applet in the major direction
......
2001-12-14 Mark McLoughlin <mark@skynet.ie>
* panel-applet-shell.c:
(impl_PanelAppletShell_saveYourself): kill.
(panel_applet_shell_class_init): upd.
* panel-applet.[ch], panel-applet-private.h:
(panel_applet_save_yourself): kill.
(panel_applet_class_init): kill "save_yuorself" signal.
2001-12-14 Mark McLoughlin <mark@skynet.ie>
* panel-applet-shell.[ch], panel-applet.[ch],
......
/*
* panel-applet-private.h:
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
* Copyright (C) 2001 Sun Microsystems, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* Copyright 2001 Sun Microsystems, Inc.
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
*/
#ifndef __PANEL_APPLET_PRIVATE_H__
......@@ -14,10 +29,6 @@
G_BEGIN_DECLS
void panel_applet_save_yourself (PanelApplet *applet,
const gchar *global_key,
const gchar *private_key);
G_END_DECLS
#endif /* __PANEL_APPLET_PRIVATE_H__ */
/*
* panel-applet-shell.c:
* panel-applet-shell.c: the panel's interface to the applet.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
* Copyright (C) 2001 Sun Microsystems, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* Copyright 2001 Sun Microsystems, Inc.
* Authors:
* Mark McLoughlin <mark@skynet.ie>
*/
#include <config.h>
......@@ -19,19 +34,6 @@ struct _PanelAppletShellPrivate {
static GObjectClass *parent_class = NULL;
static void
impl_PanelAppletShell_saveYourself (PortableServer_Servant servant,
const CORBA_char *global_key,
const CORBA_char *private_key,
CORBA_Environment *ev)
{
PanelAppletShell *shell;
shell = PANEL_APPLET_SHELL (bonobo_object (servant));
panel_applet_save_yourself (shell->priv->applet, global_key, private_key);
}
static void
impl_PanelAppletShell_getExpandFlags (PortableServer_Servant servant,
CORBA_boolean *expand_major,
......@@ -50,7 +52,6 @@ impl_PanelAppletShell_getExpandFlags (PortableServer_Servant servant,
*expand_minor = minor;
}
static void
panel_applet_shell_finalize (GObject *object)
{
......@@ -69,7 +70,6 @@ panel_applet_shell_class_init (PanelAppletShellClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
klass->epv.saveYourself = impl_PanelAppletShell_saveYourself;
klass->epv.getExpandFlags = impl_PanelAppletShell_getExpandFlags;
object_class->finalize = panel_applet_shell_finalize;
......
/*
* panel-applet-shell.h:
* panel-applet-shell.h: the panel's interface to the applet.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
* Copyright (C) 2001 Sun Microsystems, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* Copyright 2001 Sun Microsystems, Inc.
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
*/
#ifndef __PANEL_APPLET_SHELL_H__
......
/*
* panel-applet.c:
* panel-applet.c: panel applet writing library.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
* Copyright (C) 2001 Sun Microsystems, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* Copyright 2001 Sun Microsystems, Inc.
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
*/
#include <unistd.h>
......@@ -94,25 +109,6 @@ panel_applet_set_expand_flags (PanelApplet *applet,
applet->priv->expand_minor = expand_minor;
}
void
panel_applet_save_yourself (PanelApplet *applet,
const gchar *global_key,
const gchar *private_key)
{
if (applet->priv->global_key)
g_free (applet->priv->global_key);
if (applet->priv->private_key)
g_free (applet->priv->private_key);
applet->priv->global_key = g_strdup (global_key);
applet->priv->private_key = g_strdup (private_key);
g_signal_emit (G_OBJECT (applet),
panel_applet_signals [SAVE_YOURSELF],
0);
}
/**
* panel_applet_get_size:
* @applet: A #PanelApplet.
......@@ -515,17 +511,6 @@ panel_applet_class_init (PanelAppletClass *klass,
PANEL_TYPE_PANEL_APPLET_BACKGROUND_TYPE,
G_TYPE_POINTER,
G_TYPE_STRING);
panel_applet_signals [SAVE_YOURSELF] =
g_signal_new ("save_yourself",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (PanelAppletClass, save_yourself),
NULL,
NULL,
panel_applet_marshal_VOID__VOID,
G_TYPE_NONE,
0);
}
static void
......
/*
* panel-applet.h:
* panel-applet.h: panel applet writing API.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
* Copyright (C) 2001 Sun Microsystems, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* Copyright 2001 Sun Microsystems, Inc.
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
* Authors:
* Mark McLoughlin <mark@skynet.ie>
*/
#ifndef __PANEL_FRAME_H__
#define __PANEL_FRAME_H__
#ifndef __PANEL_APPLET_H__
#define __PANEL_APPLET_H__
#include <glib/gmacros.h>
#include <gtk/gtkeventbox.h>
......@@ -64,8 +79,6 @@ struct _PanelAppletClass {
PanelAppletBackgroundType type,
GdkColor *color,
const gchar *pixmap);
void (*save_yourself) (PanelApplet *applet);
};
GType panel_applet_get_type (void) G_GNUC_CONST;
......@@ -126,4 +139,4 @@ int main (int argc, char *argv []) \
G_END_DECLS
#endif /* __PANEL_APPLET_FRAME_H__ */
#endif /* __PANEL_APPLET_H__ */
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