[dia] [warningectomy] fix casts
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] [warningectomy] fix casts
- Date: Tue, 3 Aug 2010 11:27:26 +0000 (UTC)
commit 531930ccf913ce7c7f833478a104b42c8ffdb7bf
Author: Hans Breuer <hans breuer org>
Date: Mon Aug 2 15:06:06 2010 +0200
[warningectomy] fix casts
interface.c: In function 'display_data_received_callback':
interface.c:479: warning: passing argument 1 of 'gtk_window_present'
from incompatible pointer type
/usr/include/gtk-2.0/gtk/gtkwindow.h:329: note: expected 'struct
GtkWindow *' but argument is of type 'struct GtkWidget *'
interface.c: In function 'create_widget_from_xpm_or_gdkp':
interface.c:1097: warning: pointer targets in passing argument 2 of
'gdk_pixbuf_new_from_inline' differ in signedness
/usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h:153: note: expected
'const guint8 *' but argument is of type 'char *'
interface.c: In function 'create_integrated_ui':
interface.c:1627: warning: unused variable 'pixbuf'
app/interface.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/app/interface.c b/app/interface.c
index 68c9a61..ba7c79a 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -476,7 +476,7 @@ display_data_received_callback (GtkWidget *widget,
dia_dnd_file_drag_data_received (widget, context, x, y, data, info, time, ddisp);
}
/* ensure the right window has the focus for text editing */
- gtk_window_present(ddisp->shell);
+ gtk_window_present(GTK_WINDOW(ddisp->shell));
}
/**
@@ -1094,7 +1094,7 @@ create_widget_from_xpm_or_gdkp(gchar **icon_data, GtkWidget *button)
if (strncmp((char*)icon_data, "GdkP", 4) == 0) {
GdkPixbuf *p;
- p = gdk_pixbuf_new_from_inline(-1, (char*)icon_data, TRUE, NULL);
+ p = gdk_pixbuf_new_from_inline(-1, (guint8*)icon_data, TRUE, NULL);
pixmapwidget = gtk_image_new_from_pixbuf(p);
} else {
GdkBitmap *mask = NULL;
@@ -1624,7 +1624,6 @@ create_integrated_ui (void)
GtkWidget *notebook;
GtkWidget *statusbar;
GtkAccelGroup *accel_group;
- GdkPixbuf *pixbuf;
GtkWidget *layer_view;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]