Skip to content

V
vlc-1.1
Commit 5dfbd013 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

PDA intf: clean up 

Fix some warnings
Get the pixmaps from the right directory
parent d171dda1
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
modules/gui/pda/pda.c
View file @ 5dfbd013
...@@ -168,14 +168,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -168,14 +168,7 @@ static void Run( intf_thread_t *p_intf )
#endif #endif
/* Create some useful widgets that will certainly be used */ /* Create some useful widgets that will certainly be used */
/* FIXME: magic path */ add_pixmap_directory(config_GetDataDir());
add_pixmap_directory("share");
add_pixmap_directory("/usr/share/vlc");
/* Path for pixmaps under linupy 1.4 */
add_pixmap_directory("/usr/local/share/pixmaps/vlc");
/* Path for pixmaps under linupy 2.0 */
add_pixmap_directory("/usr/share/pixmaps/vlc");
p_intf->p_sys->p_window = create_pda(); p_intf->p_sys->p_window = create_pda();
if (p_intf->p_sys->p_window == NULL) if (p_intf->p_sys->p_window == NULL)
...@@ -257,7 +250,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -257,7 +250,7 @@ static void Run( intf_thread_t *p_intf )
G_TYPE_UINT64, /* File size */ G_TYPE_UINT64, /* File size */
G_TYPE_STRING, /* Owner */ G_TYPE_STRING, /* Owner */
G_TYPE_STRING);/* Group */ G_TYPE_STRING);/* Group */
ReadDirectory(p_intf, p_filelist, "."); ReadDirectory(p_intf, p_filelist, (char*)".");
gtk_tree_view_set_model(GTK_TREE_VIEW(p_intf->p_sys->p_tvfile), GTK_TREE_MODEL(p_filelist)); gtk_tree_view_set_model(GTK_TREE_VIEW(p_intf->p_sys->p_tvfile), GTK_TREE_MODEL(p_filelist));
g_object_unref(p_filelist); /* Model will be released by GtkTreeView */ g_object_unref(p_filelist); /* Model will be released by GtkTreeView */
gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(p_intf->p_sys->p_tvfile)),GTK_SELECTION_MULTIPLE); gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(p_intf->p_sys->p_tvfile)),GTK_SELECTION_MULTIPLE);
...@@ -554,6 +547,8 @@ static int Manage( intf_thread_t *p_intf ) ...@@ -554,6 +547,8 @@ static int Manage( intf_thread_t *p_intf )
*****************************************************************************/ *****************************************************************************/
void GtkDisplayDate( GtkAdjustment *p_adj, gpointer userdata ) void GtkDisplayDate( GtkAdjustment *p_adj, gpointer userdata )
{ {
(void)p_adj;
intf_thread_t *p_intf; intf_thread_t *p_intf;
p_intf = (intf_thread_t*) userdata; p_intf = (intf_thread_t*) userdata;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment