CN-Client: Fixing player build break caused by gtk_list_store_insert_with_values()

Thanks.

This is now on HEAD. I removed the comment original code
that I forgot to 
remove in the CR too.

At 05:09 PM 12/12/2006, Bob Clark wrote:
>Looks good, Daniel.
>
>--Bob
>
>At 04:04 PM 12/12/2006, Daniel Yek wrote:
>
>>Modified by: dyekreal.com
>>Date: 12/12/2006
>>Project: Helix Player
>>
>>Synopsis:
>>   Fixing player build break caused by
gtk_list_store_insert_with_values()
>>   not being in the RHEL4 libraries in the build
farm.
>>
>>Overview:
>>   I have been worrying that using GTK+ 2.6
functions available in LSB might
>>   cause some problems in supporting older
distributions that we might still
>>   care about. This indeed caused a problem, right
here in the build farm,
>>   where the RHEL4 GTK+ libraries used for the
Current branch doesn't contain
>>   all functions defined in LSB 3.1.
>>
>>   This fix breaks
gtk_list_store_insert_with_values() into 2 functions
>>   available in earlier GTK+ versions:
>>     gtk_list_store_set_value() and
>>     gtk_list_store_set().
>>
>>
>>Files Modified:
>>player/common/gtk/hxplaylist.cpp
>>
>>Platforms and Profiles Build Verified:
>>Profile: helix_client_all_define
>>Platform: Fedora Core 5
>>
>>Platforms and Profiles Functionality verified:
>>Profile: helix_client_all_define
>>Platform: Fedora Core 5
>>
>>Branch: HEAD
>>
>>Copyright assignment: I am a RealNetworks employee.
>>

Index: hxplaylist.cpp
============================================================
=======
RCS file: /cvsroot/player/common/gtk/hxplaylist.cpp,v
retrieving revision 1.7
diff -u -w -r1.7 hxplaylist.cpp
--- hxplaylist.cpp      12 Dec 2006 02:58:10 -0000      1.7
+++ hxplaylist.cpp      13 Dec 2006 01:18:57 -0000
 -291,8
+291,8 

      GtkTreeIter treeiter;
      memset(&treeiter, 0, sizeof(treeiter));
-    gtk_list_store_insert_with_values(liststore,
&treeiter,
-                                      pos,
+    gtk_list_store_insert(liststore, &treeiter, pos);
+    gtk_list_store_set(liststore, &treeiter,
                                       
HX_PLAYLIST_COLUMN_LOCATION,       uri,
                                       
HX_PLAYLIST_COLUMN_CLIP_VALID, 
uri_valid,
                                       
HX_PLAYLIST_COLUMN_METADATA_DIRTY, 
TRUE,
 -1070,8
+1070,8 
              {
                  // Add the metadata from the m3u
                  gchar* duration = 
hx_util_duration_to_string(extinf_duration);
-                gtk_list_store_insert_with_values (
-                        store, &treeiter, pos++,
+                gtk_list_store_insert(store, &treeiter,
pos++);
+                gtk_list_store_set(store, &treeiter,
                          HX_PLAYLIST_COLUMN_LOCATION,      
    location,
                          HX_PLAYLIST_COLUMN_CLIP_VALID, 
location_is_valid,
                          HX_PLAYLIST_COLUMN_METADATA_DIRTY,
    TRUE,
 -1085,8
+1085,8 
              }
              else
              {
-                gtk_list_store_insert_with_values (
-                        store, &treeiter, pos++,
+                gtk_list_store_insert(store, &treeiter,
pos++);
+                gtk_list_store_set(store, &treeiter,
                          HX_PLAYLIST_COLUMN_LOCATION,      
    location,
                          HX_PLAYLIST_COLUMN_CLIP_VALID, 
location_is_valid,
                          HX_PLAYLIST_COLUMN_METADATA_DIRTY,
    TRUE,

-- 
Daniel Yek


_______________________________________________
Player-dev mailing list
Player-devhelixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/play
er-dev