vlc-gpe: add 0.8.4, with PDA interface patch

3 files changed, 1775 insertions, 0 deletions

diff --git a/packages/vlc/vlc-gpe-0.8.4/.mtn2git_empty b/packages/vlc/vlc-gpe-0.8.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/vlc/vlc-gpe-0.8.4/.mtn2git_empty
diff --git a/packages/vlc/vlc-gpe-0.8.4/pda-interface.patch b/packages/vlc/vlc-gpe-0.8.4/pda-interface.patch
new file mode 100644
index 0000000000..2eadbb32f4
--- /dev/null
+++ b/packages/vlc/vlc-gpe-0.8.4/pda-interface.patch
@@ -0,0 +1,1669 @@
+diff -ur vlc-0.8.4a/modules/gui/pda/pda.c vlc-0.8.4a-pda/modules/gui/pda/pda.c
+--- vlc-0.8.4a/modules/gui/pda/pda.c	2005-12-11 22:36:19.000000000 +0100
++++ vlc-0.8.4a-pda/modules/gui/pda/pda.c	2006-04-04 17:41:06.000000000 +0200
+@@ -445,8 +445,6 @@
+             }
+ 
+             /* Manage the slider */
+-#if 0
+-#define p_area p_input->p_selected_area
+             if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+             {
+                 /* Manage the slider for CPU_CAPABILITY_FPU hardware */
+@@ -461,7 +459,7 @@
+                         /* Update the value */
+                         p_intf->p_sys->p_adj->value =
+                         p_intf->p_sys->f_adj_oldvalue =
+-                            ( 100. * p_area->i_tell ) / p_area->i_size;
++                            ( 100. * var_GetTime( p_intf->p_sys->p_input, "time" ) ) / var_GetTime( p_intf->p_sys->p_input, "length" );
+                         g_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ),
+                                                  "value_changed" );
+                     }
+@@ -495,7 +493,7 @@
+                         /* Update the value */
+                         p_intf->p_sys->p_adj->value =
+                         p_intf->p_sys->i_adj_oldvalue =
+-                            ( 100 * p_area->i_tell ) / p_area->i_size;
++                            ( 100 * var_GetTime( p_intf->p_sys->p_input, "time" ) ) / var_GetTime( p_intf->p_sys->p_input, "length" );
+                         g_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ),
+                                                  "value_changed" );
+                     }
+@@ -515,8 +513,6 @@
+                     }
+                 }
+             }
+-#undef p_area
+-#endif
+         }
+         vlc_mutex_unlock( &p_input->object_lock );
+     }
+diff -ur vlc-0.8.4a/modules/gui/pda/pda_callbacks.c vlc-0.8.4a-pda/modules/gui/pda/pda_callbacks.c
+--- vlc-0.8.4a/modules/gui/pda/pda_callbacks.c	2005-12-11 22:36:19.000000000 +0100
++++ vlc-0.8.4a-pda/modules/gui/pda/pda_callbacks.c	2006-04-05 10:26:41.000000000 +0200
+@@ -442,7 +442,7 @@
+     p_intf->p_sys->b_slider_free = 1;
+     vlc_mutex_unlock( &p_intf->change_lock );
+ 
+-    return TRUE;
++    return FALSE;
+ }
+ 
+ 
+@@ -455,7 +455,7 @@
+     p_intf->p_sys->b_slider_free = 0;
+     vlc_mutex_unlock( &p_intf->change_lock );
+ 
+-    return TRUE;
++    return FALSE;
+ }
+ 
+ void SliderMove(GtkRange *range, GtkScrollType scroll, gpointer user_data)
+@@ -1102,6 +1102,8 @@
+     p_entryStdURL = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryStdURL" );
+     p_entryStdAnnounce = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryAnnounceChannel" );
+     p_entryStdTTL = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryStdTTL" );
++    p_checkSAP = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkSAP" );
++    p_checkSLP = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkSLP" );
+ 
+     p_std_access = gtk_entry_get_text(GTK_ENTRY(p_entryStdAccess));
+     p_std_muxer = gtk_entry_get_text(GTK_ENTRY(p_entryStdMuxer));
+diff -ur vlc-0.8.4a/modules/gui/pda/pda.glade vlc-0.8.4a-pda/modules/gui/pda/pda.glade
+--- vlc-0.8.4a/modules/gui/pda/pda.glade	2005-12-11 22:36:19.000000000 +0100
++++ vlc-0.8.4a-pda/modules/gui/pda/pda.glade	2006-04-05 10:50:39.000000000 +0200
+@@ -14,6 +14,12 @@
+   <property name="resizable">True</property>
+   <property name="destroy_with_parent">False</property>
+   <property name="icon">vlc16x16.png</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++  <property name="focus_on_map">True</property>
+   <signal name="delete_event" handler="onPDADeleteEvent" last_modification_time="Fri, 26 Sep 2003 13:23:22 GMT"/>
+ 
+   <child>
+@@ -30,9 +36,23 @@
+ 	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+ 	  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+ 	  <property name="tooltips">True</property>
++	  <property name="show_arrow">True</property>
+ 
+ 	  <child>
+-	    <widget class="button" id="tbRewind">
++	    <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
++	      <property name="visible">True</property>
++	      <property name="draw">True</property>
++	      <property name="visible_horizontal">True</property>
++	      <property name="visible_vertical">True</property>
++	    </widget>
++	    <packing>
++	      <property name="expand">False</property>
++	      <property name="homogeneous">False</property>
++	    </packing>
++	  </child>
++
++	  <child>
++	    <widget class="GtkToolButton" id="tbRewind">
+ 	      <property name="width_request">22</property>
+ 	      <property name="height_request">22</property>
+ 	      <property name="visible">True</property>
+@@ -40,16 +60,19 @@
+ 	      <property name="label" translatable="yes">Rewind</property>
+ 	      <property name="use_underline">True</property>
+ 	      <property name="icon">pda-rewindb16x16.xpm</property>
+-	      <property name="new_group">True</property>
++	      <property name="visible_horizontal">True</property>
++	      <property name="visible_vertical">True</property>
++	      <property name="is_important">False</property>
+ 	      <signal name="clicked" handler="onRewind" last_modification_time="Fri, 26 Sep 2003 12:26:47 GMT"/>
+ 	    </widget>
+ 	    <packing>
+-	      <property name="new_group">True</property>
++	      <property name="expand">False</property>
++	      <property name="homogeneous">True</property>
+ 	    </packing>
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="button" id="tbPause">
++	    <widget class="GtkToolButton" id="tbPause">
+ 	      <property name="width_request">22</property>
+ 	      <property name="height_request">22</property>
+ 	      <property name="visible">True</property>
+@@ -57,12 +80,19 @@
+ 	      <property name="label" translatable="yes">Pause</property>
+ 	      <property name="use_underline">True</property>
+ 	      <property name="icon">pda-pauseb16x16.xpm</property>
++	      <property name="visible_horizontal">True</property>
++	      <property name="visible_vertical">True</property>
++	      <property name="is_important">False</property>
+ 	      <signal name="clicked" handler="onPause" last_modification_time="Fri, 26 Sep 2003 12:27:01 GMT"/>
+ 	    </widget>
++	    <packing>
++	      <property name="expand">False</property>
++	      <property name="homogeneous">True</property>
++	    </packing>
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="button" id="tbPlay">
++	    <widget class="GtkToolButton" id="tbPlay">
+ 	      <property name="width_request">22</property>
+ 	      <property name="height_request">22</property>
+ 	      <property name="visible">True</property>
+@@ -70,12 +100,19 @@
+ 	      <property name="label" translatable="yes">Play</property>
+ 	      <property name="use_underline">True</property>
+ 	      <property name="icon">pda-playb16x16.xpm</property>
++	      <property name="visible_horizontal">True</property>
++	      <property name="visible_vertical">True</property>
++	      <property name="is_important">False</property>
+ 	      <signal name="clicked" handler="onPlay" last_modification_time="Fri, 26 Sep 2003 12:27:14 GMT"/>
+ 	    </widget>
++	    <packing>
++	      <property name="expand">False</property>
++	      <property name="homogeneous">True</property>
++	    </packing>
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="button" id="tbStop">
++	    <widget class="GtkToolButton" id="tbStop">
+ 	      <property name="width_request">22</property>
+ 	      <property name="height_request">22</property>
+ 	      <property name="visible">True</property>
+@@ -83,12 +120,19 @@
+ 	      <property name="label" translatable="yes">Stop</property>
+ 	      <property name="use_underline">True</property>
+ 	      <property name="icon">pda-stopb16x16.xpm</property>
++	      <property name="visible_horizontal">True</property>
++	      <property name="visible_vertical">True</property>
++	      <property name="is_important">False</property>
+ 	      <signal name="clicked" handler="onStop" last_modification_time="Fri, 26 Sep 2003 12:27:25 GMT"/>
+ 	    </widget>
++	    <packing>
++	      <property name="expand">False</property>
++	      <property name="homogeneous">True</property>
++	    </packing>
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="button" id="tbForward">
++	    <widget class="GtkToolButton" id="tbForward">
+ 	      <property name="width_request">22</property>
+ 	      <property name="height_request">22</property>
+ 	      <property name="visible">True</property>
+@@ -96,12 +140,32 @@
+ 	      <property name="label" translatable="yes">Forward</property>
+ 	      <property name="use_underline">True</property>
+ 	      <property name="icon">pda-forwardb16x16.xpm</property>
++	      <property name="visible_horizontal">True</property>
++	      <property name="visible_vertical">True</property>
++	      <property name="is_important">False</property>
+ 	      <signal name="clicked" handler="onForward" last_modification_time="Fri, 26 Sep 2003 12:27:35 GMT"/>
+ 	    </widget>
++	    <packing>
++	      <property name="expand">False</property>
++	      <property name="homogeneous">True</property>
++	    </packing>
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="button" id="tbAbout">
++	    <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
++	      <property name="visible">True</property>
++	      <property name="draw">True</property>
++	      <property name="visible_horizontal">True</property>
++	      <property name="visible_vertical">True</property>
++	    </widget>
++	    <packing>
++	      <property name="expand">False</property>
++	      <property name="homogeneous">False</property>
++	    </packing>
++	  </child>
++
++	  <child>
++	    <widget class="GtkToolButton" id="tbAbout">
+ 	      <property name="width_request">22</property>
+ 	      <property name="height_request">22</property>
+ 	      <property name="visible">True</property>
+@@ -109,31 +173,47 @@
+ 	      <property name="label" translatable="yes">About</property>
+ 	      <property name="use_underline">True</property>
+ 	      <property name="icon">vlc16x16.png</property>
+-	      <property name="new_group">True</property>
++	      <property name="visible_horizontal">True</property>
++	      <property name="visible_vertical">True</property>
++	      <property name="is_important">False</property>
+ 	      <signal name="clicked" handler="onAbout" last_modification_time="Fri, 26 Sep 2003 12:27:44 GMT"/>
+ 	    </widget>
+ 	    <packing>
+-	      <property name="new_group">True</property>
++	      <property name="expand">False</property>
++	      <property name="homogeneous">True</property>
+ 	    </packing>
+ 	  </child>
+ 
+ 	  <child>
+-	    <widget class="GtkLabel" id="timeLabel">
++	    <widget class="GtkToolItem" id="toolitem1">
+ 	      <property name="visible">True</property>
+-	      <property name="label">00:00:00</property>
+-	      <property name="use_underline">False</property>
+-	      <property name="use_markup">False</property>
+-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+-	      <property name="wrap">False</property>
+-	      <property name="selectable">False</property>
+-	      <property name="xalign">0.5</property>
+-	      <property name="yalign">0.5</property>
+-	      <property name="xpad">0</property>
+-	      <property name="ypad">0</property>
+-	      <property name="new_group">True</property>
++	      <property name="visible_horizontal">True</property>
++	      <property name="visible_vertical">True</property>
++	      <property name="is_important">False</property>
++
++	      <child>
++		<widget class="GtkLabel" id="timeLabel">
++		  <property name="visible">True</property>
++		  <property name="label">00:00:00</property>
++		  <property name="use_underline">False</property>
++		  <property name="use_markup">False</property>
++		  <property name="justify">GTK_JUSTIFY_LEFT</property>
++		  <property name="wrap">False</property>
++		  <property name="selectable">False</property>
++		  <property name="xalign">0.5</property>
++		  <property name="yalign">0.5</property>
++		  <property name="xpad">0</property>
++		  <property name="ypad">0</property>
++		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		  <property name="width_chars">-1</property>
++		  <property name="single_line_mode">False</property>
++		  <property name="angle">0</property>
++		</widget>
++	      </child>
+ 	    </widget>
+ 	    <packing>
+-	      <property name="new_group">True</property>
++	      <property name="expand">False</property>
++	      <property name="homogeneous">False</property>
+ 	    </packing>
+ 	  </child>
+ 	</widget>
+@@ -212,6 +292,9 @@
+ 			      <property name="rules_hint">False</property>
+ 			      <property name="reorderable">False</property>
+ 			      <property name="enable_search">True</property>
++			      <property name="fixed_height_mode">False</property>
++			      <property name="hover_selection">False</property>
++			      <property name="hover_expand">False</property>
+ 			      <signal name="row_activated" handler="onFileListRow" last_modification_time="Fri, 26 Sep 2003 13:30:40 GMT"/>
+ 			    </widget>
+ 			  </child>
+@@ -240,6 +323,7 @@
+ 			      <property name="label" translatable="yes">Add to Playlist</property>
+ 			      <property name="use_underline">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			      <signal name="pressed" handler="onAddFileToPlaylist" last_modification_time="Fri, 26 Sep 2003 12:31:03 GMT"/>
+ 			    </widget>
+ 			    <packing>
+@@ -276,13 +360,17 @@
+ 	      <property name="label" translatable="yes">File</property>
+ 	      <property name="use_underline">False</property>
+ 	      <property name="use_markup">False</property>
+-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
++	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+ 	      <property name="wrap">False</property>
+ 	      <property name="selectable">False</property>
+ 	      <property name="xalign">0.5</property>
+ 	      <property name="yalign">0.5</property>
+ 	      <property name="xpad">0</property>
+ 	      <property name="ypad">0</property>
++	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	      <property name="width_chars">-1</property>
++	      <property name="single_line_mode">False</property>
++	      <property name="angle">0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="type">tab</property>
+@@ -311,13 +399,17 @@
+ 		      <property name="label" translatable="yes">MRL:</property>
+ 		      <property name="use_underline">False</property>
+ 		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
++		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+ 		      <property name="wrap">False</property>
+ 		      <property name="selectable">False</property>
+ 		      <property name="xalign">0.5</property>
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xpad">0</property>
+ 		      <property name="ypad">0</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="padding">0</property>
+@@ -462,6 +554,10 @@
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xpad">0</property>
+ 		      <property name="ypad">0</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">0</property>
+@@ -486,6 +582,10 @@
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xpad">0</property>
+ 		      <property name="ypad">0</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">0</property>
+@@ -628,6 +728,10 @@
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xpad">0</property>
+ 		      <property name="ypad">0</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">0</property>
+@@ -756,6 +860,10 @@
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xpad">0</property>
+ 		      <property name="ypad">0</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">0</property>
+@@ -780,6 +888,10 @@
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xpad">0</property>
+ 		      <property name="ypad">0</property>
++		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++		      <property name="width_chars">-1</property>
++		      <property name="single_line_mode">False</property>
++		      <property name="angle">0</property>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="left_attach">0</property>
+@@ -798,6 +910,7 @@
+ 		      <property name="label" translatable="yes">enable</property>
+ 		      <property name="use_underline">True</property>
+ 		      <property name="relief">GTK_RELIEF_NORMAL</property>
++		      <property name="focus_on_click">True</property>
+ 		      <property name="active">False</property>
+ 		      <property name="inconsistent">False</property>
+ 		      <property name="draw_indicator">True</property>
+@@ -836,6 +949,7 @@
+ 		      <property name="label" translatable="yes">Add to Playlist</property>
+ 		      <property name="use_underline">True</property>
+ 		      <property name="relief">GTK_RELIEF_NORMAL</property>
++		      <property name="focus_on_click">True</property>
+ 		      <signal name="pressed" handler="onAddNetworkPlaylist" last_modification_time="Fri, 26 Sep 2003 12:37:36 GMT"/>
+ 		    </widget>
+ 		    <packing>
+@@ -857,7 +971,7 @@
+ 	      </child>
+ 	    </widget>
+ 	    <packing>
+-	      <property name="tab_expand">True</property>
++	      <property name="tab_expand">False</property>
+ 	      <property name="tab_fill">True</property>
+ 	    </packing>
+ 	  </child>
+@@ -868,13 +982,17 @@
+ 	      <property name="label" translatable="yes">Network</property>
+ 	      <property name="use_underline">False</property>
+ 	      <property name="use_markup">False</property>
+-	      <property name="justify">GTK_JUSTIFY_CENTER</property>
++	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+ 	      <property name="wrap">False</property>
+ 	      <property name="selectable">False</property>
+ 	      <property name="xalign">0.5</property>
+ 	      <property name="yalign">0.5</property>
+ 	      <property name="xpad">0</property>
+ 	      <property name="ypad">0</property>
++	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	      <property name="width_chars">-1</property>
++	      <property name="single_line_mode">False</property>
++	      <property name="angle">0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="type">tab</property>
+@@ -923,6 +1041,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -947,6 +1069,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -971,6 +1097,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -995,6 +1125,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1019,6 +1153,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1043,6 +1181,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1067,6 +1209,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1091,6 +1237,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1115,6 +1265,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1139,6 +1293,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1163,6 +1321,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1187,6 +1349,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1677,6 +1843,7 @@
+ 			      <property name="label" translatable="yes">enable</property>
+ 			      <property name="use_underline">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			      <property name="active">False</property>
+ 			      <property name="inconsistent">False</property>
+ 			      <property name="draw_indicator">True</property>
+@@ -1726,6 +1893,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1744,6 +1915,7 @@
+ 			      <property name="label" translatable="yes">enable</property>
+ 			      <property name="use_underline">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			      <property name="active">False</property>
+ 			      <property name="inconsistent">False</property>
+ 			      <property name="draw_indicator">True</property>
+@@ -1786,6 +1958,7 @@
+ 		      <property name="label" translatable="yes">Add to Playlist</property>
+ 		      <property name="use_underline">True</property>
+ 		      <property name="relief">GTK_RELIEF_NORMAL</property>
++		      <property name="focus_on_click">True</property>
+ 		      <signal name="pressed" handler="onAddCameraToPlaylist" last_modification_time="Fri, 26 Sep 2003 12:47:31 GMT"/>
+ 		    </widget>
+ 		    <packing>
+@@ -1825,6 +1998,10 @@
+ 	      <property name="yalign">0.5</property>
+ 	      <property name="xpad">0</property>
+ 	      <property name="ypad">0</property>
++	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++	      <property name="width_chars">-1</property>
++	      <property name="single_line_mode">False</property>
++	      <property name="angle">0</property>
+ 	    </widget>
+ 	    <packing>
+ 	      <property name="type">tab</property>
+@@ -1873,6 +2050,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -1993,6 +2174,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -2017,6 +2202,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -2041,6 +2230,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -2065,6 +2258,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -2089,6 +2286,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -2113,6 +2314,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -2137,6 +2342,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -2161,6 +2370,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -2185,6 +2398,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++			      <property name="width_chars">-1</property>
++			      <property name="single_line_mode">False</property>
++			      <property name="angle">0</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">0</property>
+@@ -2507,6 +2724,7 @@
+ 			      <property name="label" translatable="yes">enable</property>
+ 			      <property name="use_underline">True</property>
+ 			      <property name="relief">GTK_RELIEF_NORMAL</property>
++			      <property name="focus_on_click">True</property>
+ 			      <property name="active">False</property>
+ 			      <property name="inconsistent">False</property>
+ 			      <property name="draw_indicator">True</property>
+@@ -2553,7 +2771,7 @@
+ 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ 			      <property name="snap_to_ticks">False</property>
+ 			      <property name="wrap">False</property>
+-			      <property name="adjustment">800000 0 1e+06 1 10 10</property>
++			      <property name="adjustment">800000 0 1000000 1 10 10</property>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="left_attach">1</property>
+@@ -2599,6 +2817,10 @@
+ 			      <property name="yalign">0.5</property>
+ 			      <property name="xpad">0</property>
+ 			      <property name="ypad">0</property>
++			      <property