rpms/gnomeradio/F-8 gnomeradio-svn.patch, NONE, 1.1 gnomeradio.spec, 1.4, 1.5 gnomeradio-omf-fix.patch, 1.1, NONE

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/gnomeradio/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19991

Modified Files:
	gnomeradio.spec 
Added Files:
	gnomeradio-svn.patch 
Removed Files:
	gnomeradio-omf-fix.patch 
Log Message:
- backport some segfault fixes from SVN

gnomeradio-svn.patch:

--- NEW FILE gnomeradio-svn.patch ---
diff -ruwbB gnomeradio-1.7/src/gui.c gnomeradio-1.7svn/src/gui.c
--- gnomeradio-1.7/src/gui.c	2006-11-25 12:46:54.000000000 +0100
+++ gnomeradio-1.7svn/src/gui.c	2008-01-24 16:14:06.000000000 +0100
@@ -47,6 +47,13 @@
 
 #define TRANSLATORS "TRANSLATORS"
 
+GtkWidget* mute_button, *preset_combo;
+GtkAdjustment *adj;
+GtkTooltips *tooltips;
+
+int mom_ps;
+gnomeradio_settings settings;
+
 static GtkWidget *drawing_area;
 static GdkPixmap *digits, *signal_s, *stereo;
 static GtkWidget *freq_scale;
@@ -416,11 +423,12 @@
 	gtk_tooltips_set_tip(tooltips, vol_scale, text, NULL);
 	g_free(text);*/
 	
-	g_assert(tray_menu);
+    if (tray_menu) {
 	g_signal_handler_block(G_OBJECT(mute_menuitem), mute_menuitem_toggled_cb_id);
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mute_menuitem), vol == 0);
 	g_signal_handler_unblock(G_OBJECT(mute_menuitem), mute_menuitem_toggled_cb_id);
 }
+}
 
 #if 0
 static gboolean poll_volume_change(gpointer data)
@@ -1078,6 +1086,7 @@
 	g_set_application_name(_("Gnomeradio"));
 	
 #if GNOME_14
+    if (!g_thread_supported ()) g_thread_init(NULL);
 	ctx = g_option_context_new("- Gnomeradio");
 	g_option_context_add_main_entries(ctx, entries, GETTEXT_PACKAGE);  
 	g_option_context_add_group(ctx, gst_init_get_option_group());
@@ -1113,15 +1122,6 @@
 	}
 
 	load_settings();
-	create_tray_menu(app);
-	
-	gtk_combo_box_append_text(GTK_COMBO_BOX(preset_combo), _("manual"));
-	for (ptr = settings.presets; ptr; ptr = g_list_next(ptr)) {
-		preset *ps = (preset*)ptr->data;
-		gtk_combo_box_append_text(GTK_COMBO_BOX(preset_combo), ps->title);
-	}
-	preset_combo_set_item(mom_ps);
-
 	start_mixer(FALSE, app);
 	start_radio(FALSE, app);
 	if (is_first_start() || do_scan) {
@@ -1132,6 +1132,15 @@
 			set_first_time_flag();
 		}
 	}
+	create_tray_menu(app);
+	
+	gtk_combo_box_append_text(GTK_COMBO_BOX(preset_combo), _("manual"));
+	for (ptr = settings.presets; ptr; ptr = g_list_next(ptr)) {
+		preset *ps = (preset*)ptr->data;
+		gtk_combo_box_append_text(GTK_COMBO_BOX(preset_combo), ps->title);
+	}
+	preset_combo_set_item(mom_ps);
+
 	gtk_widget_show_all(app);
 
 	/* Create an tray icon */
diff -ruwbB gnomeradio-1.7/src/gui.h gnomeradio-1.7svn/src/gui.h
--- gnomeradio-1.7/src/gui.h	2006-02-26 17:34:57.000000000 +0100
+++ gnomeradio-1.7svn/src/gui.h	2008-01-24 16:14:06.000000000 +0100
@@ -43,15 +43,6 @@
 	gfloat freq;
 };
 
-GtkWidget* mute_button, *preset_combo;
-GtkAdjustment *adj;
-GtkTooltips *tooltips;
-
-
-int mom_ps;
-
-gnomeradio_settings settings;
-
 void start_radio(gboolean restart, GtkWidget *app);
 
 void start_mixer(gboolean restart, GtkWidget *app);
diff -ruwbB gnomeradio-1.7/src/lirc.c gnomeradio-1.7svn/src/lirc.c
--- gnomeradio-1.7/src/lirc.c	2006-02-26 22:20:55.000000000 +0100
+++ gnomeradio-1.7svn/src/lirc.c	2008-01-24 16:14:06.000000000 +0100
@@ -32,6 +32,13 @@
 #include "lirc.h"
 #include "gui.h"
 
+extern GtkWidget* mute_button, *preset_combo;
+extern GtkAdjustment *adj;
+extern GtkTooltips *tooltips;
+
+extern int mom_ps;
+extern gnomeradio_settings settings;
+
 static int fd = -1;
 static struct lirc_config *config = NULL;
 
diff -ruwbB gnomeradio-1.7/src/prefs.c gnomeradio-1.7svn/src/prefs.c
--- gnomeradio-1.7/src/prefs.c	2006-11-25 12:33:57.000000000 +0100
+++ gnomeradio-1.7svn/src/prefs.c	2008-01-24 16:14:06.000000000 +0100
@@ -23,6 +23,13 @@
 #include "gui.h"
 #include "rec_tech.h"
 
+extern GtkWidget* mute_button, *preset_combo;
+extern GtkAdjustment *adj;
+extern GtkTooltips *tooltips;
+
+extern int mom_ps;
+extern gnomeradio_settings settings;
+
 static GtkWidget *device_entry;
 static GtkWidget *mixer_combo;
 static GtkWidget *mute_on_exit_cb;
diff -ruwbB gnomeradio-1.7/src/trayicon.c gnomeradio-1.7svn/src/trayicon.c
--- gnomeradio-1.7/src/trayicon.c	2006-11-05 18:42:57.000000000 +0100
+++ gnomeradio-1.7svn/src/trayicon.c	2008-01-24 16:14:06.000000000 +0100
@@ -23,6 +23,12 @@
 #include "gui.h"
 #include "trayicon.h"
 
+extern GtkAdjustment *adj;
+extern GtkTooltips *tooltips;
+
+extern int mom_ps;
+extern gnomeradio_settings settings;
+
 static GtkWidget *showwindow_menuitem;
 
 static void mute_menuitem_toggled_cb(GtkCheckMenuItem *checkmenuitem, gpointer user_data)
diff -ruwbB gnomeradio-1.7/help/C/gnomeradio.xml gnomeradio-1.7svn/help/C/gnomeradio.xml
--- gnomeradio-1.7/help/C/gnomeradio.xml	2006-12-02 12:35:19.000000000 +0100
+++ gnomeradio-1.7svn/help/C/gnomeradio.xml	2008-01-24 16:14:06.000000000 +0100
@@ -24,6 +24,7 @@
 	 <title>&app; Manual V&manrevision;</title> 
 	 <copyright> 
 		<year>2002</year> 
 
+ 
 		<holder>Jörgen Scheibengruber</holder> 
 	 </copyright> 
 <!-- translators: uncomment this:
@@ -34,6 +35,11 @@
   </copyright>
 
    -->
+
+    <abstract role="description">
+      <para>Gnomeradio is a FM-tuner application for the GNOME desktop.</para>
+    </abstract>
+
 	<publisher> 
 		<publishername>GNOME Documentation Project</publishername> 
 	</publisher> 
diff -ruwbB gnomeradio-1.7/help/gnomeradio.omf.in gnomeradio-1.7svn/help/gnomeradio.omf.in
--- gnomeradio-1.7/help/gnomeradio.omf.in	2006-12-02 12:35:19.000000000 +0100
+++ gnomeradio-1.7svn/help/gnomeradio.omf.in	2008-01-24 16:14:06.000000000 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 <omf>
   <resource>
-    <subject category="GNOME|Applications|Multimedia"/>
+    <subject category="Applications|Multimedia"/>
     <type>manual</type>
     <relation seriesid="aa808024-e437-11d6-9898-aa172e9bc9ed"/>
     <rights type="GNU FDL" license.version="1.1" holder="Jörgen Scheibengruber"/>


Index: gnomeradio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomeradio/F-8/gnomeradio.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnomeradio.spec	30 Aug 2007 16:23:20 -0000	1.4
+++ gnomeradio.spec	23 Feb 2008 22:49:46 -0000	1.5
@@ -1,12 +1,12 @@
 Summary: Graphical FM-Tuner program for GNOME
 Name: gnomeradio
 Version: 1.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/
 Source: http://www.wh-hms.uni-ulm.de/~mfcn/gnomeradio/packages/%{name}-%{version}.tar.gz
-Patch0: %{name}-omf-fix.patch
+Patch0: %{name}-svn.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -32,7 +32,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .omf-fix
+%patch0 -p1 -b .svn
 
 %build
 %configure \
@@ -105,6 +105,9 @@
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %changelog
+* Sat Feb 23 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.7-4
+- backport some segfault fixes from SVN
+
 * Wed Aug 29 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.7-3
 - one more missing BR
 - fix building of help


--- gnomeradio-omf-fix.patch DELETED ---