diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-09-17 14:17:32 +0200 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-09-17 14:17:32 +0200 |
| commit | 564a1a10b42fece5fe8b6c600234ca0c7ff264fc (patch) | |
| tree | 41a5d61efdbc7424f5abe3d31719b430c539540f | |
| parent | e97e1bf62b4b7de61edf760a77de7e55afa93d84 (diff) | |
| parent | 31d7a961936d952708544aa56c0680cfebce39c7 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes78
Notes
split repo tag: libs-extern_ooo/DEV300_m88
| -rw-r--r-- | libegg/source/eggtrayicon.c | 7 | ||||
| -rw-r--r-- | libegg/source/makefile.mk | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libegg/source/eggtrayicon.c b/libegg/source/eggtrayicon.c index 603e66fbc99d..a03bbd00b9ea 100644 --- a/libegg/source/eggtrayicon.c +++ b/libegg/source/eggtrayicon.c @@ -230,10 +230,11 @@ egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_ { EggTrayIcon *icon = user_data; XEvent *xev = (XEvent *)xevent; + (void)event; if (xev->xany.type == ClientMessage && xev->xclient.message_type == icon->manager_atom && - xev->xclient.data.l[1] == icon->selection_atom) + (Atom)(xev->xclient.data.l[1]) == icon->selection_atom) { egg_tray_icon_update_manager_window (icon, TRUE); } @@ -383,6 +384,7 @@ egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon) static gboolean transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) { + (void)user_data; gdk_window_clear_area (widget->window, event->area.x, event->area.y, event->area.width, event->area.height); return FALSE; @@ -392,6 +394,8 @@ static void make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, gpointer user_data) { + (void)previous_style; + (void)user_data; gdk_window_set_back_pixmap (widget->window, NULL, TRUE); } @@ -401,6 +405,7 @@ make_transparent (GtkWidget *widget, gpointer user_data) if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) return; + (void)user_data; gtk_widget_set_app_paintable (widget, TRUE); gtk_widget_set_double_buffered (widget, FALSE); gdk_window_set_back_pixmap (widget->window, NULL, TRUE); diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk index e1dae4abcaa2..3bc9b808b15a 100644 --- a/libegg/source/makefile.mk +++ b/libegg/source/makefile.mk @@ -63,7 +63,7 @@ SHL1LIBS= $(SLB)$/eggtray.lib # --- Targets ---------------------------------- .ENDIF # L10N_framework -.IF "$(OS)$(CPU)" == "LINUXX" +.IF "$(OS)$(CPU)" == "LINUXX" && "$(LIBRARY_PATH)" != "" EXTRALIBPATHS+=-L$(LIBRARY_PATH) .ENDIF # "$(OS)$(CPU)" == "LINUXX" .INCLUDE : target.mk |