Changeset 245 for trunk/desktop/class_c/wpfolder.c
- Timestamp:
- Mar 10, 2007, 4:21:32 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/desktop/class_c/wpfolder.c
r244 r245 168 168 */ 169 169 NOM_Scope gulong NOMLINK impl_WPFolder_wpAddToContent(WPFolder* nomSelf, const PWPObject wpObject, 170 const CORBA_char * chrFileName,CORBA_Environment *ev)170 CORBA_Environment *ev) 171 171 { 172 172 WPFolderData* nomThis=WPFolderGetData(nomSelf); … … 176 176 pValue->pGTree=_fldrObjects; 177 177 pValue->wpObject=wpObject; 178 pValue->chrKey=NOMPath_copyCString( WPFileSystem_wpQueryFileName( wpObject, FALSE, NULLHANDLE)178 pValue->chrKey=NOMPath_copyCString( WPFileSystem_wpQueryFileName((WPFileSystem*)wpObject, FALSE, NULLHANDLE) 179 179 , NULLHANDLE); 180 180 … … 188 188 { 189 189 190 g_message("%s: key % x (%s), value %x, data %d", __FUNCTION__, key, key, pValue,data);190 g_message("%s: key %p (%s), value %p, data %d", __FUNCTION__, key, (char*)key, pValue, (int)data); 191 191 return FALSE; 192 192 } … … 218 218 g_tree_remove() will reinsert any object coming by so g_tree_remove() can't 219 219 be used. */ 220 g_tree_steal(_fldrObjects, NOMPath_queryCString(WPFileSystem_wpQueryFileName(wpObject, FALSE, NULLHANDLE), 220 g_tree_steal(_fldrObjects, NOMPath_queryCString(WPFileSystem_wpQueryFileName((WPFileSystem*)wpObject, 221 FALSE, NULLHANDLE), 221 222 NULLHANDLE)); 222 223 224 223 return TRUE; 225 224 } … … 242 241 243 242 #warning !!!!! Use Title here? !!!!! 244 display_name=NOMPath_copyCString(WPFileSystem_wpQueryFileName( wpObject, FALSE, NULLHANDLE),243 display_name=NOMPath_copyCString(WPFileSystem_wpQueryFileName((WPFileSystem*)wpObject, FALSE, NULLHANDLE), 245 244 NULLHANDLE);/* Do we need a copy here? */ 246 245 … … 280 279 if(_pListStore) 281 280 { 282 /* Each object which is added to a store*/281 /* Find the correct STOREITEM for this folder */ 283 282 pui=_wpFindUseItem(wpObject, USAGE_STORE, 284 283 NULLHANDLE, NULLHANDLE); … … 296 295 } 297 296 pui--; 298 pui=_wpFindUseItem(wpObject, USAGE_STORE, 299 pui, NULLHANDLE); 297 pui=_wpFindUseItem(wpObject, USAGE_STORE, pui, NULLHANDLE); 300 298 } 301 299 } … … 366 364 #endif 367 365 /* insert into contents list */ 368 WPFolder_wpAddToContent(nomSelf, wpObject, gchrCurrentEntry,NULLHANDLE);366 WPFolder_wpAddToContent(nomSelf, wpObject, NULLHANDLE); 369 367 }/* if(nomIsObj(wpObject)) */ 370 368 g_free (path); … … 501 499 } 502 500 503 gtkIconView= WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, NULLHANDLE);501 gtkIconView=(GtkIconView*)WPFolderWindow_wpQueryContainerHandle(wpFldrWindow, NULLHANDLE); 504 502 505 503 gtk_icon_view_set_model(GTK_ICON_VIEW (gtkIconView),
Note:
See TracChangeset
for help on using the changeset viewer.