[ #13333 ] Fix warning

gnome/src/dbus/dbus.c

@@ -166,7 +166,7 @@ incoming_message_cb(DBusGProxy *proxy UNUSED, const gchar *callID UNUSED,
             return;
         }
 
-        new_text_message(conf,msg);
+        new_text_message_conf(conf,msg);
     }
 }
 
@@ -253,10 +253,10 @@ call_state_cb(DBusGProxy *proxy UNUSED, const gchar *callID,
 }
 
 static void
-toggle_im(conference_obj_t *conf, gboolean activate)
+toggle_im(conference_obj_t *conf, gboolean activate UNUSED)
 {
     for (GSList *p = conf->participant_list; p; p = g_slist_next(p)) {
-        callable_obj_t *call = calllist_get_call(current_calls_tab, p->data);
+        //callable_obj_t *call = calllist_get_call(current_calls_tab, p->data);
 
         /*TODO elepage(2012) Implement IM messaging toggle here*/
     }
@@ -355,7 +355,7 @@ conference_removed_cb(DBusGProxy *proxy UNUSED, const gchar *confID,
 
     // remove all participants for this conference
     for (GSList *p = c->participant_list; p; p = g_slist_next(p)) {
-        callable_obj_t *call = calllist_get_call(current_calls_tab, p->data);
+        //callable_obj_t *call = calllist_get_call(current_calls_tab, p->data);
         /*TODO elepage(2012) implement unmerging of IM here*/
     }
 

gnome/src/mainwindow.c

@@ -268,7 +268,11 @@ create_main_window()
     pack_main_window_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
 
     /* Setup call main widget*/
+#if GTK_MAJOR_VERSION == 2
     GtkWidget *vpaned = gtk_vpaned_new();
+#else
+    GtkWidget *vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
+#endif
     current_calls_tab->mainwidget = vpaned;
     gtk_widget_show (vpaned);
     gtk_box_pack_start(GTK_BOX(vbox), vpaned, TRUE, TRUE, 0);

gnome/src/messaging/message_tab.c

@@ -172,6 +172,12 @@ new_text_message(callable_obj_t* call, const gchar* message)
     append_message(tab,name,message);
 }
 
+void
+new_text_message_conf(conference_obj_t* call, const gchar* message)
+{
+   new_text_message((callable_obj_t*)call,message);
+}
+
 void
 replace_markup_tag(GtkTextBuffer* text_buffer, GtkTextIter* start)
 {
@@ -186,7 +192,7 @@ replace_markup_tag(GtkTextBuffer* text_buffer, GtkTextIter* start)
 
 //conference_obj_t
 message_tab *
-create_messaging_tab(callable_obj_t* call UNUSED)
+create_messaging_tab(callable_obj_t* call)
 {
 
     /* Do not create a new tab if it already exist */
@@ -289,3 +295,9 @@ create_messaging_tab(callable_obj_t* call UNUSED)
 
     return self;
 }
+
+message_tab *
+create_messaging_tab_conf(conference_obj_t* call)
+{
+   return create_messaging_tab((callable_obj_t*)call);
+}
\ No newline at end of file

gnome/src/messaging/message_tab.h

@@ -37,6 +37,7 @@
 
 #include <gtk/gtk.h>
 #include <callable_obj.h>
+#include <conference_obj.h>
 
 /** An IM conversation */
 typedef struct {
@@ -54,6 +55,7 @@ typedef struct {
  * @param call the conversation call
  */
 message_tab* create_messaging_tab(callable_obj_t* call);
+message_tab* create_messaging_tab_conf(conference_obj_t* call);
 
 /** Return the main conversation notebook */
 GtkWidget *get_tab_box();
@@ -62,7 +64,8 @@ GtkWidget *get_tab_box();
  * @param call the call
  * @param message the new message
  */
-void new_text_message(callable_obj_t* call, const gchar* message);
+void new_text_message(callable_obj_t *call, const gchar *message);
+void new_text_message_conf(conference_obj_t *call, const gchar *message);
 
 
 /**

gnome/src/uimanager.c

@@ -656,7 +656,7 @@ call_im(void* foo UNUSED)
             WARN("Sorry. Instant messaging is not allowed outside a call\n");
     } else {
         if (selectedConf) {
-            create_messaging_tab(selectedConf);
+            create_messaging_tab_conf(selectedConf);
         } else
             WARN("Sorry. Instant messaging is not allowed outside a call\n");
     }