Move should_create_salut_account to local-xmpp-assistant-widget

[empathy.git] / libempathy-gtk / empathy-cell-renderer-activatable.c

diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 6aedb03066fb203ed7bd9fd83ff525d0c04441b9..c2325adecb5de17241801627507e6995942b48f8 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -112,8 +112,8 @@ cell_renderer_activatable_activate (GtkCellRenderer      *cell,
     GdkEvent *event,
     GtkWidget *widget,
     const gchar *path_string,
-    GdkRectangle *background_area,
-    GdkRectangle *cell_area,
+    const GdkRectangle *background_area,
+    const GdkRectangle *cell_area,
     GtkCellRendererState  flags)
 {
   EmpathyCellRendererActivatable *activatable;
@@ -145,13 +145,12 @@ cell_renderer_activatable_activate (GtkCellRenderer      *cell,
 
 static void
 cell_renderer_activatable_render (
-    GtkCellRenderer      *cell,
-    GdkWindow            *window,
-    GtkWidget            *widget,
-    GdkRectangle         *background_area,
-    GdkRectangle         *cell_area,
-    GdkRectangle         *expose_area,
-    GtkCellRendererState  flags)
+    GtkCellRenderer *cell,
+    cairo_t *cr,
+    GtkWidget *widget,
+    const GdkRectangle *background_area,
+    const GdkRectangle *cell_area,
+    GtkCellRendererState flags)
 {
   EmpathyCellRendererActivatablePriv *priv = GET_PRIV (cell);
 
@@ -160,7 +159,7 @@ cell_renderer_activatable_render (
 
   GTK_CELL_RENDERER_CLASS
     (empathy_cell_renderer_activatable_parent_class)->render (
-        cell, window, widget, background_area, cell_area, expose_area, flags);
+        cell, cr, widget, background_area, cell_area, flags);
 }
 
 static void
@@ -184,7 +183,7 @@ empathy_cell_renderer_activatable_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__STRING,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_STRING);