X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgsterror.c;h=820b51e0e78e50dcb913179e0e0496aa74a03cc2;hb=cc6342d853f4252c5d5cf09fff9d3379ad467fbc;hp=17ec81f68bdd183dcc4aa4103aef6c04ff28b809;hpb=5fbdd763bbece834e39218a969df5c1d77e79d54;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/gst/gsterror.c b/gst/gsterror.c
index 17ec81f..820b51e 100644
--- a/gst/gsterror.c
+++ b/gst/gsterror.c
@@ -13,17 +13,18 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 /**
  * SECTION:gsterror
+ * @title: GstError
  * @short_description: Categorized error messages
  * @see_also: #GstMessage
  *
  * GStreamer elements can throw non-fatal warnings and fatal errors.
- * Higher-level elements and applications can programatically filter
+ * Higher-level elements and applications can programmatically filter
  * the ones they are interested in or can recover from,
  * and have a default handler handle the rest of them.
  *
@@ -66,45 +67,42 @@
  *
  * Elements throw errors using the #GST_ELEMENT_ERROR convenience macro:
  *
- * <example>
- * <title>Throwing an error</title>
- *   <programlisting>
+ * ## Throwing an error
+ *
+ *   |[
  *     GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
  *       (_("No file name specified for reading.")), (NULL));
- *   </programlisting>
- * </example>
+ *   ]|
  *
  * Things to keep in mind:
- * <itemizedlist>
- *   <listitem><para>Don't go off inventing new error codes.  The ones
+ *
+ *   * Don't go off inventing new error codes.  The ones
  *     currently provided should be enough.  If you find your type of error
- *     does not fit the current codes, you should use FAILED.</para></listitem>
- *   <listitem><para>Don't provide a message if the default one suffices.
- *     this keeps messages more uniform.  Use (NULL) - not forgetting the
- *     parentheses.</para></listitem>
- *   <listitem><para>If you do supply a custom message, it should be
+ *     does not fit the current codes, you should use FAILED.
+ *   * Don't provide a message if the default one suffices.
+ *     this keeps messages more uniform.  Use (%NULL) - not forgetting the
+ *     parentheses.
+ *   * If you do supply a custom message, it should be
  *     marked for translation.  The message should start with a capital
  *     and end with a period.  The message should describe the error in short,
  *     in a human-readable form, and without any complex technical terms.
  *     A user interface will present this message as the first thing a user
  *     sees.  Details, technical info, ... should go in the debug string.
- *   </para></listitem>
- *   <listitem><para>The debug string can be as you like.  Again, use (NULL)
+ *
+ *   * The debug string can be as you like.  Again, use (%NULL)
  *     if there's nothing to add - file and line number will still be
  *     passed.  #GST_ERROR_SYSTEM can be used as a shortcut to give
- *     debug information on a system call error.</para></listitem>
- * </itemizedlist>
+ *     debug information on a system call error.
  *
- * Last reviewed on 2006-09-15 (0.10.10)
  */
 
-/* FIXME 0.11: the entire error system needs an overhaul - it's not very
+/* FIXME 2.0: the entire error system needs an overhaul - it's not very
  * useful the way it is. Also, we need to be able to specify additional
  * 'details' for errors (e.g. disk/file/resource error -> out-of-space; or
  * put the url/filename/device name that caused the error somewhere)
  * without having to add enums for every little thing.
  *
- * FIXME 0.11: get rid of GST_{CORE,LIBRARY,RESOURCE,STREAM}_ERROR_NUM_ERRORS.
+ * FIXME 2.0: get rid of GST_{CORE,LIBRARY,RESOURCE,STREAM}_ERROR_NUM_ERRORS.
  * Maybe also replace _quark() functions with g_quark_from_static_string()?
  */
 #ifdef HAVE_CONFIG_H
@@ -143,7 +141,7 @@ gst_error_get_core_error (GstCoreError code)
     case GST_CORE_ERROR_THREAD:
       return _("Internal GStreamer error: thread problem." FILE_A_BUG);
     case GST_CORE_ERROR_NEGOTIATION:
-      return _("Internal GStreamer error: negotiation problem." FILE_A_BUG);
+      return _("GStreamer error: negotiation problem.");
     case GST_CORE_ERROR_EVENT:
       return _("Internal GStreamer error: event problem." FILE_A_BUG);
     case GST_CORE_ERROR_SEEK:
@@ -155,7 +153,7 @@ gst_error_get_core_error (GstCoreError code)
     case GST_CORE_ERROR_MISSING_PLUGIN:
       return _("Your GStreamer installation is missing a plug-in.");
     case GST_CORE_ERROR_CLOCK:
-      return _("Internal GStreamer error: clock problem." FILE_A_BUG);
+      return _("GStreamer error: clock problem.");
     case GST_CORE_ERROR_DISABLED:
       return _("This application is trying to use GStreamer functionality "
           "that has been disabled.");
@@ -223,6 +221,8 @@ gst_error_get_resource_error (GstResourceError code)
       return _("Could not get/set settings from/on resource.");
     case GST_RESOURCE_ERROR_NO_SPACE_LEFT:
       return _("No space left on the resource.");
+    case GST_RESOURCE_ERROR_NOT_AUTHORIZED:
+      return _("Not authorized to access resource.");
     case GST_RESOURCE_ERROR_NUM_ERRORS:
     default:
       break;