totem r5957 - in trunk: . browser-plugin src/backend src/plugins/galago src/plugins/gromit src/plugins/lirc src/plugins/skipto



Author: pwithnall
Date: Mon Feb  9 22:15:42 2009
New Revision: 5957
URL: http://svn.gnome.org/viewvc/totem?rev=5957&view=rev

Log:
2009-02-09  Philip Withnall  <philip tecnocode co uk>

	* browser-plugin/totem-plugin-viewer.c
	(totem_embedded_open_internal), (totem_embedded_set_window):
	* src/backend/bacon-video-widget-gst-0.10.c
	(bacon_video_widget_open_with_subtitle),
	(bacon_video_widget_get_mrls), (bacon_video_widget_can_get_frames),
	(bacon_video_widget_new):
	* src/backend/bacon-video-widget-xine.c (xine_try_error),
	(bacon_video_widget_new), (bacon_video_widget_open_with_subtitle),
	(bacon_video_widget_get_mrls), (bacon_video_widget_can_get_frames):
	* src/plugins/galago/totem-galago.c (impl_activate):
	* src/plugins/gromit/totem-gromit.c (impl_activate):
	* src/plugins/lirc/totem-lirc.c (impl_activate):
	* src/plugins/skipto/totem-skipto-plugin.c (impl_activate): Patch
	from Christian Persch <chpe gnome org> to use g_set_error_literal
	where appropriate. (Closes: #570538)



Modified:
   trunk/ChangeLog
   trunk/browser-plugin/totem-plugin-viewer.c
   trunk/src/backend/bacon-video-widget-gst-0.10.c
   trunk/src/backend/bacon-video-widget-xine.c
   trunk/src/plugins/galago/totem-galago.c
   trunk/src/plugins/gromit/totem-gromit.c
   trunk/src/plugins/lirc/totem-lirc.c
   trunk/src/plugins/skipto/totem-skipto-plugin.c

Modified: trunk/browser-plugin/totem-plugin-viewer.c
==============================================================================
--- trunk/browser-plugin/totem-plugin-viewer.c	(original)
+++ trunk/browser-plugin/totem-plugin-viewer.c	Mon Feb  9 22:15:42 2009
@@ -459,10 +459,10 @@
 		uri = emb->current_uri;
 
 	if (!uri) {
-		g_set_error (error,
-			     TOTEM_EMBEDDED_ERROR_QUARK,
-			     TOTEM_EMBEDDED_NO_URI,
-			     _("No URI to play"));
+		g_set_error_literal (error,
+                                     TOTEM_EMBEDDED_ERROR_QUARK,
+                                     TOTEM_EMBEDDED_NO_URI,
+                                     _("No URI to play"));
 		//FIXME totem_embedded_set_error (emb, error); |error| may be null?
 
 		return FALSE;
@@ -582,9 +582,9 @@
 	}
 		
 	g_set_error (error,
-		     TOTEM_EMBEDDED_ERROR_QUARK,
-		     TOTEM_EMBEDDED_UNKNOWN_COMMAND,
-		     "Unknown command '%s'", command);
+                     TOTEM_EMBEDDED_ERROR_QUARK,
+                     TOTEM_EMBEDDED_UNKNOWN_COMMAND,
+                     "Unknown command '%s'", command);
 	return FALSE;
 }
 
@@ -2053,18 +2053,18 @@
 	if (embedded->window != NULL) {
 		g_warning ("Viewer: Already have a window!");
 
-		g_set_error (error,
-			     TOTEM_EMBEDDED_ERROR_QUARK,
-			     TOTEM_EMBEDDED_SETWINDOW_HAVE_WINDOW,
-			     "Already have a window");
+		g_set_error_literal (error,
+                                     TOTEM_EMBEDDED_ERROR_QUARK,
+                                     TOTEM_EMBEDDED_SETWINDOW_HAVE_WINDOW,
+                                     "Already have a window");
 		return FALSE;
 	}
 
 	if (window == 0) {
-		g_set_error (error,
-			     TOTEM_EMBEDDED_ERROR_QUARK,
-			     TOTEM_EMBEDDED_SETWINDOW_INVALID_XID,
-			     "Invalid XID");
+		g_set_error_literal (error,
+                                     TOTEM_EMBEDDED_ERROR_QUARK,
+                                     TOTEM_EMBEDDED_SETWINDOW_INVALID_XID,
+                                     "Invalid XID");
 		return FALSE;
 	}
 

Modified: trunk/src/backend/bacon-video-widget-gst-0.10.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-gst-0.10.c	(original)
+++ trunk/src/backend/bacon-video-widget-gst-0.10.c	Mon Feb  9 22:15:42 2009
@@ -2720,8 +2720,8 @@
       } else {
         gchar *cur_dir = g_get_current_dir ();
         if (!cur_dir) {
-          g_set_error (error, BVW_ERROR, BVW_ERROR_GENERIC,
-              _("Failed to retrieve working directory"));
+          g_set_error_literal (error, BVW_ERROR, BVW_ERROR_GENERIC,
+                               _("Failed to retrieve working directory"));
           return FALSE;
         }
         subtitle_uri = g_strdup_printf ("file://%s/%s", cur_dir, uris[1]);
@@ -3977,15 +3977,15 @@
     case MEDIA_TYPE_DVD: {
       if (!gst_default_registry_check_feature_version ("rsndvdbin", 0, 10, 0)) {
         GST_DEBUG ("Missing rsndvdbin");
-	g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-		     "XXX Do not use XXX");
+	g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
+                             "XXX Do not use XXX");
         return NULL;
       } else if (!gst_default_registry_check_feature_version ("mpegpsdemux", 0, 10, 0) &&
 		 gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 0) &&
       		 !gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 15)) {
         GST_DEBUG ("flupsdemux not new enough for DVD playback");
-	g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-		     "XXX Do not use XXX");
+	g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
+                             "XXX Do not use XXX");
         return NULL;
       } else {
 	gchar *uri[] = { NULL, NULL };
@@ -4002,24 +4002,24 @@
           !gst_default_registry_check_feature_version ("mpegtsparse", 0, 10, 6) ||
           !gst_default_registry_check_feature_version ("dvbsrc", 0, 10, 6)) {
         GST_DEBUG ("Missing one or all of: dvbsrc, dvbbasebin, mpegtsparse");
-	g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-		     "XXX Do not use XXX");
+	g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
+                             "XXX Do not use XXX");
         return NULL;
       }
       if (!gst_default_registry_check_feature_version ("mpegpsdemux", 0, 10, 0) &&
 	  gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 0) &&
       	  !gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 15)) {
         GST_DEBUG ("flupsdemux not new enough for DVB playback");
-	g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-		     "XXX Do not use XXX");
+	g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
+                             "XXX Do not use XXX");
 	return NULL;
       }
 
       filename = g_strdup_printf ("/dev/dvb/adapter%s/frontend0", device);
       if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
 	g_free (filename);
-	g_set_error (error, BVW_ERROR, BVW_ERROR_INVALID_DEVICE,
-		     "XXX Do not use XXX");
+	g_set_error_literal (error, BVW_ERROR, BVW_ERROR_INVALID_DEVICE,
+                             "XXX Do not use XXX");
 	return NULL;
       }
       g_free (filename);
@@ -4030,16 +4030,16 @@
         mrls = bacon_video_widget_get_dvb_mrls (device);
       } else {
         GST_DEBUG ("no channels file '%s'", filename);
-	g_set_error (error, BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND,
-		     "XXX Do not use XXX");
+	g_set_error_literal (error, BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND,
+                             "XXX Do not use XXX");
 	g_free (filename);
 	return NULL;
       }
       break;
     }
     case MEDIA_TYPE_CDDA:
-      g_set_error (error, BVW_ERROR, BVW_ERROR_UNVALID_LOCATION,
-		   "XXX Do not use XXX");
+      g_set_error_literal (error, BVW_ERROR, BVW_ERROR_UNVALID_LOCATION,
+                           "XXX Do not use XXX");
       return NULL;
     default:
       g_assert_not_reached();
@@ -4595,14 +4595,14 @@
   /* check for version */
   if (!g_object_class_find_property (
            G_OBJECT_GET_CLASS (bvw->priv->play), "frame")) {
-    g_set_error (error, BVW_ERROR, BVW_ERROR_GENERIC,
-        _("Too old version of GStreamer installed."));
+    g_set_error_literal (error, BVW_ERROR, BVW_ERROR_GENERIC,
+                         _("Too old version of GStreamer installed."));
     return FALSE;
   }
 
   /* check for video */
   if (!bvw->priv->media_has_video && !bvw->priv->show_vfx) {
-    g_set_error (error, BVW_ERROR, BVW_ERROR_GENERIC,
+    g_set_error_literal (error, BVW_ERROR, BVW_ERROR_GENERIC,
         _("Media contains no supported video streams."));
     return FALSE;
   }
@@ -4977,7 +4977,7 @@
 
   bvw->priv->play = gst_element_factory_make ("playbin", "play");
   if (!bvw->priv->play) {
-    g_set_error (err, BVW_ERROR, BVW_ERROR_PLUGIN_LOAD,
+    g_set_error_literal (err, BVW_ERROR, BVW_ERROR_PLUGIN_LOAD,
                  _("Failed to create a GStreamer play object. "
                    "Please check your GStreamer installation."));
     g_object_ref_sink (bvw);
@@ -5108,7 +5108,7 @@
         err_msg = gst_bus_poll (bvw->priv->bus, GST_MESSAGE_ERROR, 0);
         if (err_msg == NULL) {
           g_warning ("Should have gotten an error message, please file a bug.");
-          g_set_error (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN,
+          g_set_error_literal (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN,
                _("Failed to open video output. It may not be available. "
                  "Please select another video output in the Multimedia "
                  "Systems Selector."));
@@ -5120,7 +5120,7 @@
       }
     }
   } else {
-    g_set_error (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN,
+    g_set_error_literal (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN,
                  _("Could not find the video output. "
                    "You may need to install additional GStreamer plugins, "
                    "or select another video output in the Multimedia Systems "
@@ -5155,7 +5155,7 @@
         err_msg = gst_bus_poll (bus, GST_MESSAGE_ERROR, 0);
         if (err_msg == NULL) {
           g_warning ("Should have gotten an error message, please file a bug.");
-          g_set_error (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
+          g_set_error_literal (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
                        _("Failed to open audio output. You may not have "
                          "permission to open the sound device, or the sound "
                          "server may not be running. "
@@ -5175,7 +5175,7 @@
     }
     gst_object_unref (bus);
   } else {
-    g_set_error (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
+    g_set_error_literal (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
                  _("Could not find the audio output. "
                    "You may need to install additional GStreamer plugins, or "
                    "select another audio output in the Multimedia Systems "
@@ -5225,7 +5225,7 @@
     ret = gst_element_get_state (video_sink, NULL, NULL, 5 * GST_SECOND);
     if (ret != GST_STATE_CHANGE_SUCCESS) {
       GST_WARNING ("Timeout setting videosink to READY");
-      g_set_error (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN,
+      g_set_error_literal (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN,
           _("Failed to open video output. It may not be available. "
           "Please select another video output in the Multimedia Systems Selector."));
       return NULL;

Modified: trunk/src/backend/bacon-video-widget-xine.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-xine.c	(original)
+++ trunk/src/backend/bacon-video-widget-xine.c	Mon Feb  9 22:15:42 2009
@@ -1584,8 +1584,8 @@
 	}
 
 	if (save_data != NULL) {
-		g_set_error (error, BVW_ERROR, save_data->num,
-				"%s", save_data->msg);
+		g_set_error_literal (error, BVW_ERROR, save_data->num,
+                                     save_data->msg);
 		g_free (save_data->msg);
 		g_free (save_data);
 
@@ -1602,28 +1602,28 @@
 	switch (err)
 	{
 	case XINE_ERROR_NO_INPUT_PLUGIN:
-		g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-				_("There is no input plugin to handle the location of this movie"));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
+                                     _("There is no input plugin to handle the location of this movie"));
 		break;
 	case XINE_ERROR_NO_DEMUX_PLUGIN:
-		g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-				_("There is no plugin to handle this movie."));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
+                                     _("There is no plugin to handle this movie."));
 		break;
 	case XINE_ERROR_DEMUX_FAILED:
-		g_set_error (error, BVW_ERROR, BVW_ERROR_BROKEN_FILE,
-				_("This movie is broken and can not be played further."));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_BROKEN_FILE,
+                                     _("This movie is broken and can not be played further."));
 		break;
 	case XINE_ERROR_MALFORMED_MRL:
-		g_set_error (error, BVW_ERROR, BVW_ERROR_UNVALID_LOCATION,
-				_("This location is not a valid one."));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_UNVALID_LOCATION,
+                                     _("This location is not a valid one."));
 		break;
 	case XINE_ERROR_INPUT_FAILED:
-		g_set_error (error, BVW_ERROR, BVW_ERROR_FILE_GENERIC,
-				_("This movie could not be opened."));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_FILE_GENERIC,
+                                     _("This movie could not be opened."));
 		break;
 	default:
-		g_set_error (error, BVW_ERROR, BVW_ERROR_GENERIC,
-				_("Generic Error."));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_GENERIC,
+				     _("Generic Error."));
 		break;
 	}
 }
@@ -1806,8 +1806,8 @@
 		g_free (bvw->priv);
 		g_free (bvw);
 
-		g_set_error (error, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN,
-				_("No video output is available. Make sure that the program is correctly installed."));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN,
+                                     _("No video output is available. Make sure that the program is correctly installed."));
 		return NULL;
 	}
 
@@ -2466,8 +2466,8 @@
 	    && bvw->priv->ao_driver == NULL) {
 		bacon_video_widget_close (bvw);
 
-		g_set_error (error, BVW_ERROR, BVW_ERROR_AUDIO_ONLY,
-				_("This is an audio-only file and there is no audio output available."));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_AUDIO_ONLY,
+                                     _("This is an audio-only file and there is no audio output available."));
 
 		return FALSE;
 	}
@@ -3368,8 +3368,8 @@
 	switch (type) {
 	case MEDIA_TYPE_DVD:
 		if (bvw->priv->can_dvd == FALSE) {
-			g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-				     "XXX Do not use XXX");
+			g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
+                                             "XXX Do not use XXX");
 			return NULL;
 		}
 		plugin_id = "DVD";
@@ -3377,8 +3377,8 @@
 		break;
 	case MEDIA_TYPE_VCD:
 		if (bvw->priv->can_vcd == FALSE) {
-			g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-				     "XXX Do not use XXX");
+			g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
+				             "XXX Do not use XXX");
 			return NULL;
 		}
 		plugin_id = "VCD";
@@ -3386,8 +3386,8 @@
 		break;
 	case MEDIA_TYPE_DVB:
 		if (bvw->priv->can_dvb == FALSE) {
-			g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-				     "XXX Do not use XXX");
+			g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
+				             "XXX Do not use XXX");
 			return NULL;
 		} else {
 			char *path;
@@ -3395,8 +3395,8 @@
 			path = g_strdup_printf ("/dev/dvb/adapter%s/frontend0", device);
 			if (g_file_test (path, G_FILE_TEST_EXISTS) == FALSE) {
 				g_free (path);
-				g_set_error (error, BVW_ERROR, BVW_ERROR_INVALID_DEVICE,
-					     "XXX Do not use XXX");
+				g_set_error_literal (error, BVW_ERROR, BVW_ERROR_INVALID_DEVICE,
+					             "XXX Do not use XXX");
 				return NULL;
 			}
 			g_free (path);
@@ -3407,8 +3407,8 @@
 						 NULL);
 			if (g_file_test (path, G_FILE_TEST_IS_REGULAR) == FALSE) {
 				g_free (path);
-				g_set_error (error, BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND,
-					     "XXX Do not use XXX");
+				g_set_error_literal (error, BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND,
+					             "XXX Do not use XXX");
 				return NULL;
 			}
 			g_free (path);
@@ -3417,8 +3417,8 @@
 		entry_name = "media.dvb.adapter";
 		break;
 	case MEDIA_TYPE_CDDA:
-		g_set_error (error, BVW_ERROR, BVW_ERROR_UNVALID_LOCATION,
-			     "XXX Do not use XXX");
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_UNVALID_LOCATION,
+			             "XXX Do not use XXX");
 		return NULL;
 	default:
 		g_assert_not_reached ();
@@ -3456,12 +3456,12 @@
 	} else if (type == MEDIA_TYPE_DVB) {
 		/* No channels.conf, and we couldn't find it */
 		if (g_str_has_prefix (mrls[0], "Sorry, No valid channels.conf found") != FALSE) {
-			g_set_error (error, BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND,
-				     "XXX Do not use XXX");
+			g_set_error_literal (error, BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND,
+                                             "XXX Do not use XXX");
 			return NULL;
 		} else if (g_str_has_prefix (mrls[0], "Sorry, No DVB input device found.") != FALSE) {
-			g_set_error (error, BVW_ERROR, BVW_ERROR_DEVICE_BUSY,
-				     "XXX Do not use XXX");
+			g_set_error_literal (error, BVW_ERROR, BVW_ERROR_DEVICE_BUSY,
+                                             "XXX Do not use XXX");
 			return NULL;
 		}
 	}
@@ -4179,16 +4179,16 @@
 				XINE_STREAM_INFO_HAS_VIDEO) == FALSE
 			&& bvw->priv->using_vfx == FALSE)
 	{
-		g_set_error (error, BVW_ERROR, BVW_ERROR_CANNOT_CAPTURE,
-				_("No video to capture."));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_CANNOT_CAPTURE,
+				     _("No video to capture."));
 		return FALSE;
 	}
 
 	if (xine_get_stream_info (bvw->priv->stream,
 				XINE_STREAM_INFO_VIDEO_HANDLED) == FALSE)
 	{
-		g_set_error (error, BVW_ERROR, BVW_ERROR_CANNOT_CAPTURE,
-				_("Video codec is not handled."));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_CANNOT_CAPTURE,
+                                     _("Video codec is not handled."));
 		return FALSE;
 	}
 
@@ -4198,8 +4198,8 @@
 	if (xine_get_status (bvw->priv->stream) != XINE_STATUS_PLAY
 			&& bvw->priv->logo_mode == FALSE)
 	{
-		g_set_error (error, BVW_ERROR, BVW_ERROR_CANNOT_CAPTURE,
-				_("Movie is not playing."));
+		g_set_error_literal (error, BVW_ERROR, BVW_ERROR_CANNOT_CAPTURE,
+                                     _("Movie is not playing."));
 		return FALSE;
 	}
 

Modified: trunk/src/plugins/galago/totem-galago.c
==============================================================================
--- trunk/src/plugins/galago/totem-galago.c	(original)
+++ trunk/src/plugins/galago/totem-galago.c	Mon Feb  9 22:15:42 2009
@@ -167,8 +167,8 @@
 	TotemGalagoPlugin *pi = TOTEM_GALAGO_PLUGIN (plugin);
 
 	if (!galago_is_connected ()) {
-		g_set_error (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
-				_("Could not connect to the Galago daemon."));
+		g_set_error_literal (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
+                                     _("Could not connect to the Galago daemon."));
 		return FALSE;
 	}
 

Modified: trunk/src/plugins/gromit/totem-gromit.c
==============================================================================
--- trunk/src/plugins/gromit/totem-gromit.c	(original)
+++ trunk/src/plugins/gromit/totem-gromit.c	Mon Feb  9 22:15:42 2009
@@ -268,8 +268,8 @@
 	GtkWindow *window;
 
 	if (!totem_gromit_available (pi)) {
-		g_set_error (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
-				_("The gromit binary was not found."));
+		g_set_error_literal (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
+                                     _("The gromit binary was not found."));
 
 		return FALSE;
 	}

Modified: trunk/src/plugins/lirc/totem-lirc.c
==============================================================================
--- trunk/src/plugins/lirc/totem-lirc.c	(original)
+++ trunk/src/plugins/lirc/totem-lirc.c	Mon Feb  9 22:15:42 2009
@@ -283,8 +283,8 @@
 
 	fd = lirc_init ("Totem", 0);
 	if (fd < 0) {
-		g_set_error (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
-				_("Couldn't initialize lirc."));
+		g_set_error_literal (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
+                                     _("Couldn't initialize lirc."));
 		return FALSE;
 	}
 
@@ -292,8 +292,8 @@
 	path = totem_plugin_find_file (plugin, "totem_lirc_default");
 	if (path == NULL || lirc_readconfig (path, &pi->lirc_config, NULL) == -1) {
 		g_free (path);
-		g_set_error (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
-			     _("Couldn't read lirc configuration."));
+		g_set_error_literal (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
+                                     _("Couldn't read lirc configuration."));
 		close (fd);
 		return FALSE;
 	}

Modified: trunk/src/plugins/skipto/totem-skipto-plugin.c
==============================================================================
--- trunk/src/plugins/skipto/totem-skipto-plugin.c	(original)
+++ trunk/src/plugins/skipto/totem-skipto-plugin.c	Mon Feb  9 22:15:42 2009
@@ -217,8 +217,8 @@
 
 	builder_path = totem_plugin_find_file (TOTEM_PLUGIN (plugin), "skipto.ui");
 	if (builder_path == NULL) {
-		g_set_error (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
-				_("Could not load the \"Skip to\" dialog interface."));
+		g_set_error_literal (error, TOTEM_PLUGIN_ERROR, TOTEM_PLUGIN_ERROR_ACTIVATION,
+                                     _("Could not load the \"Skip to\" dialog interface."));
 		return FALSE;
 	}
 	g_free (builder_path);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]