rpms/gnome-lirc-properties/devel glp-dont-use-fluendo-remotes.patch, NONE, 1.1 gnome-lirc-properties.spec, 1.5, 1.6

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-lirc-properties/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20027

Modified Files:
	gnome-lirc-properties.spec 
Added Files:
	glp-dont-use-fluendo-remotes.patch 
Log Message:
* Thu Oct 16 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.8-7
- Remove "Update" button, and don't load Fluendo provided remote
  definitions, they're older than ours


glp-dont-use-fluendo-remotes.patch:

--- NEW FILE glp-dont-use-fluendo-remotes.patch ---
Index: gnome_lirc_properties/ui/RemoteControlProperties.py
===================================================================
--- gnome_lirc_properties/ui/RemoteControlProperties.py	(revision 60)
+++ gnome_lirc_properties/ui/RemoteControlProperties.py	(working copy)
@@ -151,7 +151,6 @@
             'radiobutton_supplied_remote',
             'radiobutton_other_remote',
             'alignment_remote_selection',
-            'button_download',
 
             # preview widgets:
             'label_preview_status',
@@ -362,8 +361,7 @@
         use_supplied = self.use_supplied_remote
 
         for child in remote_selection_widgets:
-            if child is not self.__button_download:
-                child.set_sensitive(not use_supplied)
+            child.set_sensitive(not use_supplied)
 
         # Choose supplied remote when requested:
         if use_supplied and self.supplied_remote:
Index: data/gnome-lirc-properties.glade
===================================================================
--- data/gnome-lirc-properties.glade	(revision 60)
+++ data/gnome-lirc-properties.glade	(working copy)
@@ -350,25 +350,6 @@
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="spacing">6</property>
                                     <child>
-                                      <widget class="GtkButton" id="button_download">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="tooltip" translatable="yes">Download custom configurations</property>
-                                        <property name="label" translatable="yes">_Update</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="response_id">0</property>
-                                        <signal name="clicked" handler="_on_button_download_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="pack_type">GTK_PACK_END</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
                                       <widget class="GtkButton" id="button_custom">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
Index: gnome_lirc_properties/lirc.py
===================================================================
--- gnome_lirc_properties/lirc.py	(revision 60)
+++ gnome_lirc_properties/lirc.py	(working copy)
@@ -288,6 +288,8 @@
         Reads remote configurations from tarball.
         '''
 
+        return False
+
         if not os.path.isfile(path):
             return False
 


Index: gnome-lirc-properties.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-lirc-properties/devel/gnome-lirc-properties.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-lirc-properties.spec	14 Oct 2008 00:32:25 -0000	1.5
+++ gnome-lirc-properties.spec	16 Oct 2008 16:53:50 -0000	1.6
@@ -6,7 +6,7 @@
 
 Name:		gnome-lirc-properties
 Version:	0.2.8
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Infrared Remote Controls setup tool
 
 Group:		User Interface/X Hardware Support
@@ -19,6 +19,8 @@
 Patch0:		glp-fedora-support.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=555802
 Patch1:		glp-add-ps3-detection-4.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=556585
+Patch2:		glp-dont-use-fluendo-remotes.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -46,6 +48,7 @@
 %setup -q
 %patch0 -p0 -b .fedora
 %patch1 -p0 -b .ps3
+%patch2 -p0 -b .no-fluendo-remotes
 gnome-doc-prepare --force
 aclocal
 automake --add-missing
@@ -100,6 +103,10 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Thu Oct 16 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.8-7
+- Remove "Update" button, and don't load Fluendo provided remote
+  definitions, they're older than ours
+
 * Tue Oct 14 2008 - Bastien Nocera <bnocera at redhat.com> - 0.2.8-6
 - Fix compilation