aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-10-22 00:24:36 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-10-22 17:43:50 +0800
commit62754283f2d0904b9f57cc291e4a4e1d4490f288 (patch)
tree00795c9337bb93d45aeb2c80ca735e220dad2b89
parentc77666dd4ec3151b2a3f2fdb1d6b75253bf09f43 (diff)
downloadgsoc2013-empathy-62754283f2d0904b9f57cc291e4a4e1d4490f288.tar
gsoc2013-empathy-62754283f2d0904b9f57cc291e4a4e1d4490f288.tar.gz
gsoc2013-empathy-62754283f2d0904b9f57cc291e4a4e1d4490f288.tar.bz2
gsoc2013-empathy-62754283f2d0904b9f57cc291e4a4e1d4490f288.tar.lz
gsoc2013-empathy-62754283f2d0904b9f57cc291e4a4e1d4490f288.tar.xz
gsoc2013-empathy-62754283f2d0904b9f57cc291e4a4e1d4490f288.tar.zst
gsoc2013-empathy-62754283f2d0904b9f57cc291e4a4e1d4490f288.zip
empathy-ui-utils.c: fix shadow declaration
-rw-r--r--libempathy-gtk/empathy-ui-utils.c8
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;