Migrate call status icons

gtk/calllogs.c

@@ -50,9 +50,9 @@ char *linphone_gtk_call_logs_storage_get_db_file(const char *filename){
 static void fill_renderers(GtkTreeView *v){
 	GtkTreeViewColumn *c;
 	GtkCellRenderer *r;
-	r=gtk_cell_renderer_pixbuf_new();
 
-	c=gtk_tree_view_column_new_with_attributes("icon",r,"pixbuf",0,NULL);
+	r=gtk_cell_renderer_pixbuf_new();
+	c=gtk_tree_view_column_new_with_attributes("icon",r,"icon-name",0,NULL);
 	gtk_tree_view_append_column (v,c);
 
 	r=gtk_cell_renderer_text_new ();
@@ -280,7 +280,7 @@ void linphone_gtk_call_log_update(GtkWidget *w){
 
 	store=(GtkTreeStore*)gtk_tree_view_get_model(v);
 	if (store==NULL){
-		store=gtk_tree_store_new(3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_POINTER,G_TYPE_STRING);
+		store=gtk_tree_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_POINTER,G_TYPE_STRING);
 		gtk_tree_view_set_model(v,GTK_TREE_MODEL(store));
 		g_object_unref(G_OBJECT(store));
 		fill_renderers(GTK_TREE_VIEW(linphone_gtk_get_widget(w,"logs_view")));
@@ -308,7 +308,7 @@ void linphone_gtk_call_log_update(GtkWidget *w){
 		LinphoneFriend *lf=NULL;
 		int duration=linphone_call_log_get_duration(cl);
 		time_t start_date_time=linphone_call_log_get_start_date(cl);
-		GdkPixbuf *pbuf;
+		const gchar *call_status_icon_name;
 
 #if GLIB_CHECK_VERSION(2,26,0)
 		if (start_date_time){
@@ -373,13 +373,13 @@ void linphone_gtk_call_log_update(GtkWidget *w){
 		g_free(seconds);
 		if (start_date) g_free(start_date);
 		gtk_tree_store_append (store,&iter,NULL);
-		pbuf = linphone_call_log_get_dir(cl)==LinphoneCallOutgoing ? create_pixbuf("call_status_outgoing.png") : create_pixbuf("call_status_incoming.png");
+		call_status_icon_name = linphone_call_log_get_dir(cl) == LinphoneCallOutgoing ?
+			"linphone-call-status-outgoing" : "linphone-call-status-incoming";
 		gtk_tree_store_set (store,&iter,
-		               0, pbuf,
+		               0, call_status_icon_name,
 		               1, headtxt,2,cl,-1);
 		gtk_tree_store_append (store,&iter2,&iter);
 		gtk_tree_store_set (store,&iter2,1,logtxt,-1);
-		g_object_unref(pbuf);
 		ms_free(addr);
 		g_free(logtxt);
 		g_free(headtxt);

gtk/main.ui

@@ -437,12 +437,6 @@
                     <property name="position">4</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -794,12 +788,6 @@
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>

pixmaps/CMakeLists.txt

@@ -61,6 +61,8 @@ install(FILES
 	linphone-chat-new-message.png
 	linphone-chat-writing.png
 	linphone-chat-new-message-and-writing.png
+	linphone-call-status-incoming.png
+	linphone-call-status-outgoing.png
 	DESTINATION ${ICONS_INSTALL_DIR}/48x48/status
 	PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
 )

pixmaps/Makefile.am

@@ -6,7 +6,6 @@ dist_pixmap_DATA= \
 	contact-orange.png history-orange.png\
 	startcall-small.png stopcall-red.png stopcall-small.png linphone.icns \
 	contact_starred.png contact_unstarred.png \
-	call_status_incoming.png call_status_outgoing.png \
 	ok.png \
 	notok.png
 
@@ -31,7 +30,9 @@ dist_status48icons_DATA= \
 	linphone-chat-nothing.png \
 	linphone-chat-new-message.png \
 	linphone-chat-writing.png \
-	linphone-chat-new-message-and-writing.png
+	linphone-chat-new-message-and-writing.png \
+	linphone-call-status-incoming.png \
+	linphone-call_status-outgoing.png
 
 statussvgiconsdir=$(iconsdir)/scalable/status
 dist_statussvgicons_DATA= \