diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-22 21:37:26 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-10-22 21:37:26 +0800 |
| commit | 6843cf006192fecf2382b1dd87a2fb8531a34b5f (patch) | |
| tree | 385719873f29bdc6c90f536df9a87efc2700a2be /libempathy-gtk/empathy-ui-utils.c | |
| parent | a6eb75f8fddea5331c938c1ce42d08f962275f97 (diff) | |
| parent | a28c3a40ece7da5304ca084e1f30d26dbf006b56 (diff) | |
| download | gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.gz gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.bz2 gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.lz gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.xz gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.tar.zst gsoc2013-empathy-6843cf006192fecf2382b1dd87a2fb8531a34b5f.zip | |
Merge branch 'trivia'
Diffstat (limited to 'libempathy-gtk/empathy-ui-utils.c')
| -rw-r--r-- | libempathy-gtk/empathy-ui-utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index aeb665c74..4bbc3b81c 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -152,13 +152,13 @@ empathy_builder_connect (GtkBuilder *gui, { va_list args; const gchar *name; - const gchar *signal; + const gchar *sig; GObject *object; GCallback callback; va_start (args, first_object); for (name = first_object; name; name = va_arg (args, const gchar *)) { - signal = va_arg (args, const gchar *); + sig = va_arg (args, const gchar *); callback = va_arg (args, GCallback); object = gtk_builder_get_object (gui, name); @@ -167,7 +167,7 @@ empathy_builder_connect (GtkBuilder *gui, continue; } - g_signal_connect (object, signal, callback, user_data); + g_signal_connect (object, sig, callback, user_data); } va_end (args); @@ -250,7 +250,7 @@ empathy_pixbuf_from_data_and_mime (gchar *data, } loader = gdk_pixbuf_loader_new (); - if (!gdk_pixbuf_loader_write (loader, data, data_size, &error)) { + if (!gdk_pixbuf_loader_write (loader, (guchar *) data, data_size, &error)) { DEBUG ("Failed to write to pixbuf loader: %s", error ? error->message : "No error given"); goto out; |