Updating branch refs/heads/master to eaf2ba9b53031fd16101581e1fa2705c5afe48d6 (commit) from 311a4068c42abf355293900c330420f7c1386c85 (commit)
commit eaf2ba9b53031fd16101581e1fa2705c5afe48d6 Merge: 311a406 a9c40d0 Author: Sean Davis <smd.seanda...@gmail.com> Date: Wed Jul 18 15:40:12 2012 -0400 Merge branch 'master' of https://github.com/ochosi/Parole commit a9c40d08949ab4ccfaa82ab1c82d3db33941e657 Author: Simon Steinbeiss <och...@xfce.org> Date: Wed Jul 18 20:48:20 2012 +0200 Make open location dialog modal commit ad261e851dd08aca0adc7bd3ebba238f14b2b3a3 Author: Simon Steinbeiss <och...@xfce.org> Date: Wed Jul 18 20:48:11 2012 +0200 Fix accelerators of open-location and dvd-submenu commit b42a06656922e452bd510fef13332df4e1843d90 Author: Simon Steinbeiss <och...@xfce.org> Date: Wed Jul 18 20:30:26 2012 +0200 Drop commented lines data/interfaces/open-location.ui | 43 ++----------------------------------- data/interfaces/parole.ui | 4 +- src/main.c | 2 - 3 files changed, 5 insertions(+), 44 deletions(-) diff --git a/data/interfaces/open-location.ui b/data/interfaces/open-location.ui index db2db36..31acb0e 100644 --- a/data/interfaces/open-location.ui +++ b/data/interfaces/open-location.ui @@ -2,43 +2,6 @@ <interface> <requires lib="gtk+" version="2.24"/> <!-- interface-naming-policy project-wide --> - <object class="GtkDialog" id="dialog1"> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="title">Open Location</property> - <property name="default_width">400</property> - <property name="default_height">300</property> - <property name="type_hint">normal</property> - <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">2</property> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="layout_style">end</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -52,8 +15,8 @@ <object class="GtkDialog" id="open-location"> <property name="can_focus">False</property> <property name="title" translatable="yes">Open Location</property> - <property name="default_width">400</property> - <property name="default_height">300</property> + <property name="modal">True</property> + <property name="default_width">300</property> <property name="icon_name">parole</property> <property name="type_hint">normal</property> <child internal-child="vbox"> @@ -112,7 +75,7 @@ <property name="label" translatable="yes">Please enter a network URL:</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index af96b01..6f5940a 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -134,7 +134,7 @@ </child> <child> <object class="GtkImageMenuItem" id="menu-open-location"> - <property name="label" translatable="yes">_Open location</property> + <property name="label" translatable="yes">Open _location</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_action_appearance">False</property> @@ -152,7 +152,7 @@ </child> <child> <object class="GtkImageMenuItem" id="dvd-menu"> - <property name="label" translatable="yes">DVD</property> + <property name="label" translatable="yes">_DVD</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_action_appearance">False</property> diff --git a/src/main.c b/src/main.c index dffdde8..7ef0af8 100644 --- a/src/main.c +++ b/src/main.c @@ -46,7 +46,6 @@ #include "parole-dbus.h" #include "parole-builder.h" #include "parole-rc-utils.h" -//#include "parole-setup.h" static void G_GNUC_NORETURN show_version (void) @@ -313,7 +312,6 @@ int main (int argc, char **argv) builder = parole_builder_get_main_interface (); parole_dbus_register_name (PAROLE_DBUS_NAME); - //parole_setup (); player = parole_player_new (client_id); g_free (client_id); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits