Commit 36505594 authored by Jacob Berkman's avatar Jacob Berkman Committed by Jacob Berkman

Merge from gnome-core-panel-1-1

Currently settings will get a bit mangled when going between 1.0 and
this.  This will be fixed soon.

All settings are saved to ~/.gnome/panel.d/default/.  Owen, can you
look to see if I did this right?

1999-08-20  Jacob Berkman  <jberkman@andrew.cmu.edu>

	* menu.c: s/GNOME menus/Programs/ s/User menus/Favorites/

	* session.c (load_default_applets): added
gnome-terminal.desktop

	* menu.c (create_root_menu): use KDE_ICONDIR to get the
exec.xpm
	(create_kde_menu): ditto

	* button-widget.c (button_widget_draw): don't draw the tile if
	we are not in the button and we only draw when we are

	* panel_config_global.h: added 'tile_when_over' variable

	* panel_config_global.c (misc_notebook_page): added checkbox
	for showing tiles only when the cursor is over

	* session.c: save/load tile_when_over

	* menu.c (update_hidebutton_menu): one stupid mistake...
	(update_back_menu): two stupid mistakes...

	changing properties from the menu now works :)

1999-08-19  Jacob Berkman  <jberkman@andrew.cmu.edu>

	* menu.c (make_properties_submenu): added properties for the
	hide
	mode, hidebuttons, size, background type  (these are broken
	though)
	(change_background):
	(change_hidebuttons):
	(change_size):
	(change_hiding_mode):
	(update_back_menu):
	(update_size_menu):
	(update_hidebutton_menu):
	(update_hiding_menu): functions to support this
	(add_radio_menu): convienence function

	* basep-widget.c (basep_widget_autohide): fixed a bug wrt
	changing modes

	* aligned-widget.c (aligned_pos_show_hide_right):
	(aligned_pos_show_hide_left):
	(aligned_pos_class_init): Facilitate jumping to other side of
	screen like the standard panel does

	* panel-widget.c (push_applet_left): initialize variables to
	NULL so gcc leaves us alone
	(push_applet_right): same deal here

	(now that I have the Blackbox GNOME winhint patch working...

	* basep-widget.c (basep_widget_update_winhints): set the gnome
	WM hints if available
	(basep_widget_realize):
	(basep_widget_explicit_hide):
	(basep_widget_explicit_show):
	(basep_widget_autohide):
	(basep_widget_autohide): update the hints in the functions

	* main.c (main): init win hints here

	* panel-types.h: removed unused types

1999-08-18  Jacob Berkman  <jberkman@andrew.cmu.edu>

	* *.c: store config in ~/.gnome/panel.d/default/ instead of
	~/.gnome/panel.d/Session-asd09n09sda/  (don't know if this is
	done right though)

	* *-widget.c: general fixes to clean up resizing when hidden

1999-08-18  Jacob Berkman  <jberkman@andrew.cmu.edu>

	* panel_config.c (update_config_back): fix stupid typo by me

	* panel-widget.c (panel_widget_new): g_strdup (NULL) == NULL

	* session.c (apply_global_config): call the new function

	* basep-widget.c (basep_update_frame): added function so that
	we can update the frame when we change preferences
	(basep_back_change): call this function from here

	* panel_config_global.c (misc_notebook_page): add a check box
	for keeping buttons flush with the edge

	* panel_config_global.h: added hide_panel_frame variable for
	keeping buttons flush with the edge

	* basep-widget.c (basep_back_change): only draw the frame if
	we are no-color and not hide-frame
parent 3699a92a
......@@ -3,3 +3,4 @@ Miguel de Icaza (miguel@kernel.org)
Federico Mena (quartic@gimp.org)
Tom Tromey (tromey@cygnus.com)
Ian Main (slow@intergate.bc.ca)
Jacob Berkman (jberkman@andrew.cmu.edu)
1999-08-20 Jacob Berkman <jberkman@andrew.cmu.edu>
* menu.c: s/GNOME menus/Programs/ s/User menus/Favorites/
* session.c (load_default_applets): added gnome-terminal.desktop
* menu.c (create_root_menu): use KDE_ICONDIR to get the exec.xpm
(create_kde_menu): ditto
* button-widget.c (button_widget_draw): don't draw the tile if
we are not in the button and we only draw when we are
* panel_config_global.h: added 'tile_when_over' variable
* panel_config_global.c (misc_notebook_page): added checkbox
for showing tiles only when the cursor is over
* session.c: save/load tile_when_over
* menu.c (update_hidebutton_menu): one stupid mistake...
(update_back_menu): two stupid mistakes...
changing properties from the menu now works :)
1999-08-19 Jacob Berkman <jberkman@andrew.cmu.edu>
* menu.c (make_properties_submenu): added properties for the hide
mode, hidebuttons, size, background type (these are broken though)
(change_background):
(change_hidebuttons):
(change_size):
(change_hiding_mode):
(update_back_menu):
(update_size_menu):
(update_hidebutton_menu):
(update_hiding_menu): functions to support this
(add_radio_menu): convienence function
* basep-widget.c (basep_widget_autohide): fixed a bug wrt changing
modes
* aligned-widget.c (aligned_pos_show_hide_right):
(aligned_pos_show_hide_left):
(aligned_pos_class_init): Facilitate jumping to other side of
screen like the standard panel does
* panel-widget.c (push_applet_left): initialize variables to NULL so
gcc leaves us alone
(push_applet_right): same deal here
(now that I have the Blackbox GNOME winhint patch working...
* basep-widget.c (basep_widget_update_winhints): set the gnome WM hints if
available
(basep_widget_realize):
(basep_widget_explicit_hide):
(basep_widget_explicit_show):
(basep_widget_autohide):
(basep_widget_autohide): update the hints in the functions
* main.c (main): init win hints here
* panel-types.h: removed unused types
1999-08-18 Jacob Berkman <jberkman@andrew.cmu.edu>
* *.c: store config in ~/.gnome/panel.d/default/ instead of
~/.gnome/panel.d/Session-asd09n09sda/ (don't know if this is
done right though)
* *-widget.c: general fixes to clean up resizing when hidden
Wed Aug 18 10:54:31 1999 George Lebl <jirka@5z.com>
* baspe-widget.c: don't allow closing the window with a window
* basep-widget.c: don't allow closing the window with a window
manager
1999-08-18 Jacob Berkman <jberkman@andrew.cmu.edu>
* panel_config.c (update_config_back): fix stupid typo by me
* panel-widget.c (panel_widget_new): g_strdup (NULL) == NULL
* session.c (apply_global_config): call the new function
* basep-widget.c (basep_update_frame): added function so that
we can update the frame when we change preferences
(basep_back_change): call this function from here
* panel_config_global.c (misc_notebook_page): add a check box
for keeping buttons flush with the edge
* panel_config_global.h: added hide_panel_frame variable for
keeping buttons flush with the edge
* basep-widget.c (basep_back_change): only draw the frame if we are
no-color and not hide-frame
>>>>>>> 1.602.2.10
1999-08-10 Jacob Berkman <jberkman@andrew.cmu.edu>
* applet-widget.c (applet_widget_register_stock_callback_dir):
......
1999-08-20 Jacob Berkman <jberkman@andrew.cmu.edu>
* menu.c: s/GNOME menus/Programs/ s/User menus/Favorites/
* session.c (load_default_applets): added gnome-terminal.desktop
* menu.c (create_root_menu): use KDE_ICONDIR to get the exec.xpm
(create_kde_menu): ditto
* button-widget.c (button_widget_draw): don't draw the tile if
we are not in the button and we only draw when we are
* panel_config_global.h: added 'tile_when_over' variable
* panel_config_global.c (misc_notebook_page): added checkbox
for showing tiles only when the cursor is over
* session.c: save/load tile_when_over
* menu.c (update_hidebutton_menu): one stupid mistake...
(update_back_menu): two stupid mistakes...
changing properties from the menu now works :)
1999-08-19 Jacob Berkman <jberkman@andrew.cmu.edu>
* menu.c (make_properties_submenu): added properties for the hide
mode, hidebuttons, size, background type (these are broken though)
(change_background):
(change_hidebuttons):
(change_size):
(change_hiding_mode):
(update_back_menu):
(update_size_menu):
(update_hidebutton_menu):
(update_hiding_menu): functions to support this
(add_radio_menu): convienence function
* basep-widget.c (basep_widget_autohide): fixed a bug wrt changing
modes
* aligned-widget.c (aligned_pos_show_hide_right):
(aligned_pos_show_hide_left):
(aligned_pos_class_init): Facilitate jumping to other side of
screen like the standard panel does
* panel-widget.c (push_applet_left): initialize variables to NULL so
gcc leaves us alone
(push_applet_right): same deal here
(now that I have the Blackbox GNOME winhint patch working...
* basep-widget.c (basep_widget_update_winhints): set the gnome WM hints if
available
(basep_widget_realize):
(basep_widget_explicit_hide):
(basep_widget_explicit_show):
(basep_widget_autohide):
(basep_widget_autohide): update the hints in the functions
* main.c (main): init win hints here
* panel-types.h: removed unused types
1999-08-18 Jacob Berkman <jberkman@andrew.cmu.edu>
* *.c: store config in ~/.gnome/panel.d/default/ instead of
~/.gnome/panel.d/Session-asd09n09sda/ (don't know if this is
done right though)
* *-widget.c: general fixes to clean up resizing when hidden
Wed Aug 18 10:54:31 1999 George Lebl <jirka@5z.com>
* baspe-widget.c: don't allow closing the window with a window
* basep-widget.c: don't allow closing the window with a window
manager
1999-08-18 Jacob Berkman <jberkman@andrew.cmu.edu>
* panel_config.c (update_config_back): fix stupid typo by me
* panel-widget.c (panel_widget_new): g_strdup (NULL) == NULL
* session.c (apply_global_config): call the new function
* basep-widget.c (basep_update_frame): added function so that
we can update the frame when we change preferences
(basep_back_change): call this function from here
* panel_config_global.c (misc_notebook_page): add a check box
for keeping buttons flush with the edge
* panel_config_global.h: added hide_panel_frame variable for
keeping buttons flush with the edge
* basep-widget.c (basep_back_change): only draw the frame if we are
no-color and not hide-frame
>>>>>>> 1.602.2.10
1999-08-10 Jacob Berkman <jberkman@andrew.cmu.edu>
* applet-widget.c (applet_widget_register_stock_callback_dir):
......
......@@ -78,12 +78,16 @@ base_panel_SOURCES=\
panel-widget.h \
basep-widget.c \
basep-widget.h \
snapped-widget.c \
snapped-widget.h \
drawer-widget.c \
border-widget.c \
border-widget.h \
edge-widget.c \
edge-widget.h \
aligned-widget.c \
aligned-widget.h \
sliding-widget.c \
sliding-widget.h \
drawer-widget.c \
drawer-widget.h \
corner-widget.c \
corner-widget.h \
button-widget.c \
button-widget.h \
panel-util.c \
......
This branch is a test branch for the panel. It will possibly be merged
with HEAD at a later date.
I made this branch because my hard drive was dying, and I had just spent
2 days trying to fix something which a CVS history would have helped.
In this branch:
1. centered panel
2. sliding panel
3. menu reorganization (more icons)
4 buttons can be made flush with the edge of the panel
********* IMPORTANT *************
Currently, this branch writes its save session stuff to
~/.gnome/panel.d/default/ instead of the per-session things. I did not
use the RH patch so I do not know if this is poorly done, but it seems
to be working on my system (for the most part, at least)
I intend to make panels configurable via the menu, so you
don't have to open/closese dialogs to do quick changes.
This branch isn't necessarily stable, but I will attempt to keep it
usable. (IE, I will be using it).
Questions/comments/bugs please email me.
Jacob Berkman <jberkman@andrew.cmu.edu>
\ No newline at end of file
/* Gnome panel: aligned (corner) widget
* (C) 1999 the Free Software Foundation
*
* Authores: Jacob Berkman
* George Lebl
*/
#include "aligned-widget.h"
#include "panel_config_global.h"
extern GlobalConfig global_config;
extern int pw_minimized_size;
static void aligned_pos_class_init (AlignedPosClass *klass);
static void aligned_pos_init (AlignedPos *pos);
static void aligned_pos_set_pos (BasePWidget *basep,
gint16 x, gint16 y,
guint16 w, guint16 h);
static void aligned_pos_get_pos (BasePWidget *basep,
gint16 *x, gint16 *y,
guint16 w, guint16 h);
static int aligned_pos_show_hide_left (BasePWidget *basep);
static int aligned_pos_show_hide_right (BasePWidget *basep);
static BorderPosClass *parent_class;
GtkType
aligned_pos_get_type ()
{
static GtkType aligned_pos_type = 0;
if (!aligned_pos_type) {
GtkTypeInfo aligned_pos_info = {
"AlignedPos",
sizeof (AlignedPos),
sizeof (AlignedPosClass),
(GtkClassInitFunc) aligned_pos_class_init,
(GtkObjectInitFunc) aligned_pos_init,
NULL, NULL
};
aligned_pos_type = gtk_type_unique (BORDER_POS_TYPE,
&aligned_pos_info);
}
return aligned_pos_type;
}
enum {
ALIGN_CHANGE_SIGNAL,
LAST_SIGNAL
};
static int aligned_pos_signals[LAST_SIGNAL] = { 0 };
static void
aligned_pos_class_init (AlignedPosClass *klass)
{
BasePPosClass *pos_class = BASEP_POS_CLASS(klass);
GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
parent_class = gtk_type_class(BORDER_POS_TYPE);
aligned_pos_signals[ALIGN_CHANGE_SIGNAL] =
gtk_signal_new ("align_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (AlignedPosClass,
align_change),
gtk_marshal_NONE__ENUM,
GTK_TYPE_NONE,
1, GTK_TYPE_ENUM);
gtk_object_class_add_signals (object_class,
aligned_pos_signals,
LAST_SIGNAL);
pos_class->set_pos = aligned_pos_set_pos;
pos_class->get_pos = aligned_pos_get_pos;
pos_class->north_clicked = pos_class->west_clicked =
aligned_pos_show_hide_left;
pos_class->south_clicked = pos_class->east_clicked =
aligned_pos_show_hide_right;
}
static void
aligned_pos_init (AlignedPos *pos) { }
static void
aligned_pos_set_pos (BasePWidget *basep,
gint16 x, gint16 y,
guint16 w, guint16 h)
{
int minx, miny, maxx, maxy;
BorderEdge newpos = BORDER_POS(basep->pos)->edge;
AlignedAlignment newalign = ALIGNED_POS(basep->pos)->align;
gdk_window_get_geometry (GTK_WIDGET(basep)->window,
&minx, &miny, &maxx, &maxy, NULL);
gdk_window_get_origin (GTK_WIDGET(basep)->window, &minx, &miny);
maxx += minx;
maxy += miny;
if (x >= minx &&
x <= maxx &&
y >= miny &&
y <= maxy)
return;
/*if in the inner 1/3rd, don't change to avoid fast flickery
movement*/
if ( x>(gdk_screen_width()/3) &&
x<(2*gdk_screen_width()/3) &&
y>(gdk_screen_height()/3) &&
y<(2*gdk_screen_height()/3))
return;
if ((x) * gdk_screen_height() > y * gdk_screen_width() ) {
if(gdk_screen_height() * (gdk_screen_width()-(x)) >
y * gdk_screen_width() ) {
newpos = BORDER_TOP;
if(x<gdk_screen_width()/3)
newalign = ALIGNED_LEFT;
else if (x<2*gdk_screen_width()/3)
newalign = ALIGNED_CENTER;
else
newalign = ALIGNED_RIGHT;
} else {
newpos = BORDER_RIGHT;
if(y<gdk_screen_height()/3)
newalign = ALIGNED_LEFT;
else if (y<2*gdk_screen_height()/3)
newalign = ALIGNED_CENTER;
else
newalign = ALIGNED_RIGHT;
}
} else {
if(gdk_screen_height() * (gdk_screen_width()-(x)) >
y * gdk_screen_width() ) {
newpos = BORDER_LEFT;
if(y<gdk_screen_height()/3)
newalign = ALIGNED_LEFT;
else if(y<2*gdk_screen_height()/3)
newalign = ALIGNED_CENTER;
else
newalign = ALIGNED_RIGHT;
} else {
newpos = BORDER_BOTTOM;
if(x<gdk_screen_width()/3)
newalign = ALIGNED_LEFT;
else if(x<2*gdk_screen_width()/3)
newalign = ALIGNED_CENTER;
else
newalign = ALIGNED_RIGHT;
}
}
if(newalign != ALIGNED_POS(basep->pos)->align)
aligned_widget_change_align (ALIGNED_WIDGET(basep), newalign);
if(newpos != BORDER_POS(basep->pos)->edge)
border_widget_change_edge (BORDER_WIDGET(basep), newpos);
}
static void
aligned_pos_get_pos (BasePWidget *basep, gint16 *x, gint16 *y,
guint16 w, guint16 h)
{
*x = *y = 0;
switch (BORDER_POS(basep->pos)->edge) {
case BORDER_BOTTOM:
*y = gdk_screen_height() - h;
/* fall through */
case BORDER_TOP:
/* if we wanted to be more hackish we could just do:
*x = (ALIGNED_POS(basep->pos)->align)/2.0) * (gdk_screen_width() - w)
*/
switch (ALIGNED_POS(basep->pos)->align) {
case ALIGNED_LEFT:
break;
case ALIGNED_CENTER:
*x = (gdk_screen_width() - w) / 2;
break;
case ALIGNED_RIGHT:
*x = gdk_screen_width() - w;
break;
}
break;
case BORDER_RIGHT:
*x = gdk_screen_width() - w;
/* fall through */
case BORDER_LEFT:
/* could do same as above, with height */
switch (ALIGNED_POS(basep->pos)->align) {
case ALIGNED_LEFT:
break;
case ALIGNED_CENTER:
*y = (gdk_screen_height() - h) / 2;
break;
case ALIGNED_RIGHT:
*y = gdk_screen_height() - h;
break;
}
break;
}
}
static int
aligned_pos_show_hide_left (BasePWidget *basep)
{
switch (basep->state) {
case BASEP_SHOWN:
if (ALIGNED_POS (basep->pos)->align == ALIGNED_RIGHT)
aligned_widget_change_align (ALIGNED_WIDGET (basep),
ALIGNED_LEFT);
else
basep_widget_explicit_hide (basep, BASEP_HIDDEN_LEFT);
break;
case BASEP_HIDDEN_RIGHT:
basep_widget_explicit_show (basep);
break;
case BASEP_AUTO_HIDDEN:
g_warning (_("weird: north/west clicked while auto hidden"));
break;
case BASEP_HIDDEN_LEFT:
case BASEP_MOVING:
g_assert_not_reached ();
break;
}
return FALSE;
}
static int
aligned_pos_show_hide_right (BasePWidget *basep)
{
switch (basep->state) {
case BASEP_SHOWN:
if (ALIGNED_POS (basep->pos)->align == ALIGNED_LEFT)
aligned_widget_change_align (ALIGNED_WIDGET (basep),
ALIGNED_RIGHT);
else
basep_widget_explicit_hide (basep, BASEP_HIDDEN_RIGHT);
break;
case BASEP_HIDDEN_LEFT:
basep_widget_explicit_show (basep);
break;
case BASEP_AUTO_HIDDEN:
g_warning (_("weird: south/east clicked while auto hidden"));
break;
case BASEP_MOVING:
case BASEP_HIDDEN_RIGHT:
g_assert_not_reached ();
break;
}
return FALSE;
}
void aligned_widget_change_params (AlignedWidget *aligned,
AlignedAlignment align,
BorderEdge edge,
PanelSizeType sz,
BasePMode mode,
BasePState state,
int hidebuttons_enabled,
int hidebutton_pixmaps_enabled,
PanelBackType back_type,
char *pixmap_name,
int fit_pixmap_bg,
GdkColor *back_color)
{
AlignedPos *pos = ALIGNED_POS (BASEP_WIDGET (aligned)->pos);
if (pos->align != align) {
pos->align = align;
gtk_signal_emit (GTK_OBJECT (pos),
aligned_pos_signals[ALIGN_CHANGE_SIGNAL],
align);
}
border_widget_change_params (BORDER_WIDGET (aligned),
edge, sz, mode, state,
hidebuttons_enabled,
hidebutton_pixmaps_enabled,
back_type, pixmap_name,
fit_pixmap_bg, back_color);
}
void
aligned_widget_change_align (AlignedWidget *aligned,
AlignedAlignment align)
{
BasePWidget *basep = BASEP_WIDGET (aligned);
PanelWidget *panel = PANEL_WIDGET (basep->panel);
AlignedPos *pos = ALIGNED_POS (basep->pos);
if (pos->align == align)
return;
aligned_widget_change_params (aligned, align,
BORDER_POS (pos)->edge,
panel->sz, basep->mode,
basep->state,
basep->hidebuttons_enabled,
basep->hidebutton_pixmaps_enabled,
panel->back_type,
panel->back_pixmap,
panel->fit_pixmap_bg,
&panel->back_color);
}
void
aligned_widget_change_align_edge (AlignedWidget *aligned,
AlignedAlignment align,
BorderEdge edge)
{
BasePWidget *basep = BASEP_WIDGET (aligned);
PanelWidget *panel = PANEL_WIDGET (basep->panel);
aligned_widget_change_params (aligned, align, edge,
panel->sz, basep->mode,
basep->state,
basep->hidebuttons_enabled,
basep->hidebutton_pixmaps_enabled,
panel->back_type,
panel->back_pixmap,
panel->fit_pixmap_bg,
&panel->back_color);
}
GtkWidget *
aligned_widget_new (AlignedAlignment align,
BorderEdge edge,
BasePMode mode,
BasePState state,
PanelSizeType sz,
int hidebuttons_enabled,
int hidebutton_pixmaps_enabled,
PanelBackType back_type,
char *back_pixmap,
int fit_pixmap_bg,
GdkColor *back_color)
{
AlignedWidget *aligned = gtk_type_new (ALIGNED_WIDGET_TYPE);
AlignedPos *pos = gtk_type_new (ALIGNED_POS_TYPE);
pos->align = align;
BASEP_WIDGET (aligned)->pos = BASEP_POS (pos);
border_widget_construct (BORDER_WIDGET (aligned),
edge,
TRUE, FALSE,
sz, mode, state,
hidebuttons_enabled,
hidebutton_pixmaps_enabled,
back_type,
back_pixmap, fit_pixmap_bg,
back_color);
return GTK_WIDGET (aligned);
}
/* Gnome panel: aligned (corner) widget
* (C) 1999 the Free Software Foundation
*
* Authors: Jacob Berkman
* George Lebl
*/
#ifndef __ALIGNED_WIDGET_H__
#define __ALIGNED_WIDGET_H__
#include "border-widget.h"
BEGIN_GNOME_DECLS
#define ALIGNED_POS_TYPE (aligned_pos_get_type ())
#define ALIGNED_POS(o) (GTK_CHECK_CAST ((o), ALIGNED_POS_TYPE, AlignedPos))
#define ALIGNED_POS_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), ALIGNED_POS_TYPE, AlignedPosClass))
#define IS_ALIGNED_POS(o) (GTK_CHECK_TYPE ((o), ALIGNED_POS_TYPE))
#define IS_ALIGNED_POS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), ALIGNED_POS_TYPE))
#define ALIGNED_WIDGET_TYPE (BORDER_WIDGET_TYPE)
#define ALIGNED_WIDGET(o) (BORDER_WIDGET(o))
#define ALIGNED_WIDGET_CLASS(k) (BORDER_WIDGET_CLASS(k))
#define IS_ALIGNED_WIDGET(o) (IS_BORDER_WIDGET(o) && IS_ALIGNED_POS(BASEP_WIDGET(o)->pos))
/* this is not reliable */
#define IS_ALIGNED_WIDGET_CLASS(k) (IS_BORDER_WIDGET_CLASS(k))
typedef BorderWidget AlignedWidget;
typedef BorderWidgetClass AlignedWidgetClass;
typedef struct _AlignedPos AlignedPos;
typedef struct _AlignedPosClass AlignedPosClass;
typedef enum {
ALIGNED_LEFT,
ALIGNED_CENTER,
ALIGNED_RIGHT
} AlignedAlignment;
struct _AlignedPos {
BorderPos pos;
AlignedAlignment align;
};
struct _AlignedPosClass {
BorderPosClass parent_class;
/* signal */
void (*align_change) (AlignedPos *aligned,
AlignedAlignment align);
};
GtkType aligned_pos_get_type (void);
GtkWidget *aligned_widget_new (AlignedAlignment aligned,
BorderEdge edge,
BasePMode mode,
BasePState state,
PanelSizeType sz,
int hidebuttons_enabled,
int hidebutton_pixmaps_enabled,
PanelBackType back_type,
char *back_pixmap,
int fit_pixmap_bg,
GdkColor *back_color);
void aligned_widget_change_params (AlignedWidget *alignedw,
AlignedAlignment align,
BorderEdge edge,
PanelSizeType sz,
BasePMode mode,
BasePState state,
int hidebuttons_enabled,
int hidebutton_pixmaps_enabled,
PanelBackType back_type,
char *pixmap_name,
int fit_pixmap_bg,
GdkColor *back_color);
void aligned_widget_change_align (AlignedWidget *aligned,
AlignedAlignment align);
void aligned_widget_change_align_edge (AlignedWidget *aligned,
AlignedAlignment align,
BorderEdge edge);
END_GNOME_DECLS
#endif
......@@ -1013,7 +1013,7 @@ server_applet_do_callback(CustomAppletServant *servant,
for(list = servant->callbacks;
list!=NULL;list = g_slist_next (list)) {
info = (CallbackInfo *)list->data;
if(strcmp(info->name,(char *)callback_name)==0) {
if(strcmp(info->name,(char *)callback_name)==0) {
(*(info->func)) (servant->appwidget,
info->data);
return;
......
......@@ -34,6 +34,7 @@ extern int globals_to_sync;
extern int need_complete_save;
extern GlobalConfig global_config;
extern PanelWidget *current_panel;