gnomeradio r186 - in trunk: . help help/C src

[mfcn svn gnome org]

Author: mfcn
Date: Thu Jan 24 15:14:06 2008
New Revision: 186
URL: http://svn.gnome.org/viewvc/gnomeradio?rev=186&view=rev

Log:
	* help/C/gnomeradio.xml:
	* help/gnomeradio.omf.in:
	Fix some gnome-doc-utils issues
	* src/gui.c: (start_radio), (volume_value_changed_cb):
	* src/gui.h:
	* src/lirc.c:
	* src/prefs.c: (name_cell_edited_cb):
	* src/trayicon.c:
	Wow, I had no clue of c when I started writing this



Modified:
   trunk/ChangeLog
   trunk/help/C/gnomeradio.xml
   trunk/help/gnomeradio.omf.in
   trunk/src/gui.c
   trunk/src/gui.h
   trunk/src/lirc.c
   trunk/src/prefs.c
   trunk/src/trayicon.c

Modified: trunk/help/C/gnomeradio.xml
==============================================================================
--- trunk/help/C/gnomeradio.xml	(original)
+++ trunk/help/C/gnomeradio.xml	Thu Jan 24 15:14:06 2008
@@ -35,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> 

Modified: trunk/help/gnomeradio.omf.in
==============================================================================
--- trunk/help/gnomeradio.omf.in	(original)
+++ trunk/help/gnomeradio.omf.in	Thu Jan 24 15:14:06 2008
@@ -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"/>

Modified: trunk/src/gui.c
==============================================================================
--- trunk/src/gui.c	(original)
+++ trunk/src/gui.c	Thu Jan 24 15:14:06 2008
@@ -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,10 +423,11 @@
 	gtk_tooltips_set_tip(tooltips, vol_scale, text, NULL);
 	g_free(text);*/
 	
-	g_assert(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 (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
@@ -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());

Modified: trunk/src/gui.h
==============================================================================
--- trunk/src/gui.h	(original)
+++ trunk/src/gui.h	Thu Jan 24 15:14:06 2008
@@ -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);

Modified: trunk/src/lirc.c
==============================================================================
--- trunk/src/lirc.c	(original)
+++ trunk/src/lirc.c	Thu Jan 24 15:14:06 2008
@@ -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;
 

Modified: trunk/src/prefs.c
==============================================================================
--- trunk/src/prefs.c	(original)
+++ trunk/src/prefs.c	Thu Jan 24 15:14:06 2008
@@ -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;

Modified: trunk/src/trayicon.c
==============================================================================
--- trunk/src/trayicon.c	(original)
+++ trunk/src/trayicon.c	Thu Jan 24 15:14:06 2008
@@ -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)