Commit 562b1957 authored by George Lebl's avatar George Lebl

fixed some warnings stupidities - George

parent c142fdc2
...@@ -34,7 +34,8 @@ typedef struct { ...@@ -34,7 +34,8 @@ typedef struct {
/* Create instance parameters */ /* Create instance parameters */
struct { struct {
char *params; char *params;
int pos; int pos;
int panel;
} create_instance; } create_instance;
/* Orientation change notify parameters */ /* Orientation change notify parameters */
......
...@@ -654,7 +654,7 @@ set_show_small_icons(gpointer data, gpointer user_data) ...@@ -654,7 +654,7 @@ set_show_small_icons(gpointer data, gpointer user_data)
} }
static void static void
create_instance (PanelWidget *panel, char *params, int pos) create_instance (PanelWidget *panel, char *params, int pos, int panelnum)
{ {
char *menu_base = gnome_unconditional_datadir_file ("apps"); char *menu_base = gnome_unconditional_datadir_file ("apps");
char *this_menu; char *this_menu;
...@@ -711,6 +711,7 @@ create_instance (PanelWidget *panel, char *params, int pos) ...@@ -711,6 +711,7 @@ create_instance (PanelWidget *panel, char *params, int pos)
cmd.params.register_toy.applet = menu->button; cmd.params.register_toy.applet = menu->button;
cmd.params.register_toy.id = APPLET_ID; cmd.params.register_toy.id = APPLET_ID;
cmd.params.register_toy.pos = pos; cmd.params.register_toy.pos = pos;
cmd.params.register_toy.panel = panelnum;
cmd.params.register_toy.flags = APPLET_HAS_PROPERTIES; cmd.params.register_toy.flags = APPLET_HAS_PROPERTIES;
(*panel_cmd_func) (&cmd); (*panel_cmd_func) (&cmd);
...@@ -897,7 +898,8 @@ applet_cmd_func(AppletCommand *cmd) ...@@ -897,7 +898,8 @@ applet_cmd_func(AppletCommand *cmd)
case APPLET_CMD_CREATE_INSTANCE: case APPLET_CMD_CREATE_INSTANCE:
create_instance(cmd->panel, create_instance(cmd->panel,
cmd->params.create_instance.params, cmd->params.create_instance.params,
cmd->params.create_instance.pos); cmd->params.create_instance.pos,
cmd->params.create_instance.panel);
break; break;
case APPLET_CMD_GET_INSTANCE_PARAMS: case APPLET_CMD_GET_INSTANCE_PARAMS:
......
...@@ -1012,9 +1012,9 @@ bind_applet_events(GtkWidget *widget, gpointer data) ...@@ -1012,9 +1012,9 @@ bind_applet_events(GtkWidget *widget, gpointer data)
*/ */
if (!GTK_WIDGET_NO_WINDOW(widget)) { if (!GTK_WIDGET_NO_WINDOW(widget)) {
/*FIXME: casn't be realized!*/ /*FIXME: can't be realized!*/
gtk_widget_set_events(widget, gtk_widget_get_events(widget) | /*gtk_widget_set_events(widget, gtk_widget_get_events(widget) |
APPLET_EVENT_MASK); APPLET_EVENT_MASK);*/
gtk_signal_connect(GTK_OBJECT(widget), "event", gtk_signal_connect(GTK_OBJECT(widget), "event",
(GtkSignalFunc) panel_sub_event_handler, (GtkSignalFunc) panel_sub_event_handler,
NULL); NULL);
......
...@@ -31,6 +31,10 @@ static GtkWidget *applet_menu_prop_item; ...@@ -31,6 +31,10 @@ static GtkWidget *applet_menu_prop_item;
static menu_count=0; /*how many "menu" applets we have ....*/ static menu_count=0; /*how many "menu" applets we have ....*/
/*FIXME: this should only count "main" menus!*/ /*FIXME: this should only count "main" menus!*/
#define APPLET_EVENT_MASK (GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK | \
GDK_POINTER_MOTION_MASK | \
GDK_POINTER_MOTION_HINT_MASK)
extern GList *panels; extern GList *panels;
extern GList *drawers; extern GList *drawers;
...@@ -90,7 +94,7 @@ call_applet(GtkWidget *applet, AppletCommand *cmd) ...@@ -90,7 +94,7 @@ call_applet(GtkWidget *applet, AppletCommand *cmd)
return (*cmd_func) (cmd); return (*cmd_func) (cmd);
} }
/*FIXME this should be somehow done througj signals and panel-widget*/ /*FIXME this should be somehow done through signals and panel-widget*/
static void static void
applet_orientation_notify(GtkWidget *widget, gpointer data) applet_orientation_notify(GtkWidget *widget, gpointer data)
{ {
...@@ -376,7 +380,8 @@ create_applet(char *id, char *params, int pos, int panel) ...@@ -376,7 +380,8 @@ create_applet(char *id, char *params, int pos, int panel)
cmd.panel = PANEL_WIDGET(g_list_nth(panels,panel)->data); cmd.panel = PANEL_WIDGET(g_list_nth(panels,panel)->data);
cmd.applet = NULL; cmd.applet = NULL;
cmd.params.create_instance.params = params; cmd.params.create_instance.params = params;
cmd.params.create_instance.pos = pos; cmd.params.create_instance.pos = pos;
cmd.params.create_instance.panel = panel;
(*cmd_func) (&cmd); (*cmd_func) (&cmd);
...@@ -634,20 +639,24 @@ register_toy(GtkWidget *applet, char *id, int pos, int panel, long flags) ...@@ -634,20 +639,24 @@ register_toy(GtkWidget *applet, char *id, int pos, int panel, long flags)
/* We wrap the applet in a GtkEventBox so that we can capture events over it */ /* We wrap the applet in a GtkEventBox so that we can capture events over it */
eventbox = gtk_event_box_new(); eventbox = gtk_event_box_new();
gtk_widget_set_events(eventbox, gtk_widget_get_events(eventbox) |
APPLET_EVENT_MASK);
gtk_container_add(GTK_CONTAINER(eventbox), applet); gtk_container_add(GTK_CONTAINER(eventbox), applet);
/* FIXME:get rid of this*/
/* Attach our private data to the applet */ /* Attach our private data to the applet */
gtk_object_set_data(GTK_OBJECT(eventbox), APPLET_CMD_FUNC,
gtk_object_set_data(GTK_OBJECT(eventbox), APPLET_CMD_FUNC, get_applet_cmd_func(id)); get_applet_cmd_func(id));
gtk_object_set_data(GTK_OBJECT(eventbox), APPLET_FLAGS, (gpointer) flags); gtk_object_set_data(GTK_OBJECT(eventbox), APPLET_FLAGS,
(gpointer) flags);
if(pos==PANEL_UNKNOWN_APPLET_POSITION) if(pos==PANEL_UNKNOWN_APPLET_POSITION)
pos = 0; pos = 0;
panel_widget_add(PANEL_WIDGET(g_list_nth(panels,panel)->data), panel_widget_add(PANEL_WIDGET(g_list_nth(panels,panel)->data),
eventbox, pos); eventbox, pos);
gtk_widget_show(eventbox);
gtk_widget_show(applet); gtk_widget_show(applet);
gtk_widget_show(eventbox);
applets = g_list_append(applets,eventbox); applets = g_list_append(applets,eventbox);
......
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