mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-08 18:39:54 +00:00
gst/gst-i18n-lib.h: check for ENABLE_NLS, not GETTEXT_PACKAGE
Original commit message from CVS: * gst/gst-i18n-lib.h: check for ENABLE_NLS, not GETTEXT_PACKAGE * gst/gstregistry.c: (gst_registry_add_plugin), (gst_registry_scan_path_level), (_gst_registry_remove_cache_plugins): protect possibly NULL strings * gst/parse/types.h: config.h already included before * tools/gst-inspect.c: (main): sys/wait.h also doesnt exist on mingw, so change the ifdef check check for ENABLE_NLS, not GETTEXT_PACKAGE * tools/gst-launch.c: (main): check for ENABLE_NLS, not GETTEXT_PACKAGE This commit brought to you from msys/mingw
This commit is contained in:
parent
3b9e6b3eff
commit
03159ca232
6 changed files with 30 additions and 17 deletions
16
ChangeLog
16
ChangeLog
|
@ -1,3 +1,19 @@
|
|||
2005-10-11 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
|
||||
* gst/gst-i18n-lib.h:
|
||||
check for ENABLE_NLS, not GETTEXT_PACKAGE
|
||||
* gst/gstregistry.c: (gst_registry_add_plugin),
|
||||
(gst_registry_scan_path_level),
|
||||
(_gst_registry_remove_cache_plugins):
|
||||
protect possibly NULL strings
|
||||
* gst/parse/types.h:
|
||||
config.h already included before
|
||||
* tools/gst-inspect.c: (main):
|
||||
sys/wait.h also doesn´t exist on mingw, so change the ifdef check
|
||||
check for ENABLE_NLS, not GETTEXT_PACKAGE
|
||||
* tools/gst-launch.c: (main):
|
||||
check for ENABLE_NLS, not GETTEXT_PACKAGE
|
||||
|
||||
2005-10-11 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
|
||||
* configure.ac:
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
/* FIXME: if we need it, we can add Q_ as well, like in glib */
|
||||
|
||||
#else
|
||||
|
||||
#undef GETTEXT_PACKAGE /* could still be defined in config.h */
|
||||
#define GETTEXT_PACKAGE NULL
|
||||
#define _(String) String
|
||||
#define N_(String) String
|
||||
|
|
|
@ -293,13 +293,13 @@ gst_registry_add_plugin (GstRegistry * registry, GstPlugin * plugin)
|
|||
if (existing_plugin) {
|
||||
GST_DEBUG_OBJECT (registry,
|
||||
"Replacing existing plugin %p with new plugin %p for filename \"%s\"",
|
||||
existing_plugin, plugin, plugin->filename);
|
||||
existing_plugin, plugin, GST_STR_NULL (plugin->filename));
|
||||
registry->plugins = g_list_remove (registry->plugins, existing_plugin);
|
||||
gst_object_unref (existing_plugin);
|
||||
}
|
||||
|
||||
GST_DEBUG_OBJECT (registry, "adding plugin %p for filename \"%s\"",
|
||||
plugin, plugin->filename);
|
||||
plugin, GST_STR_NULL (plugin->filename));
|
||||
|
||||
registry->plugins = g_list_prepend (registry->plugins, plugin);
|
||||
|
||||
|
@ -307,8 +307,8 @@ gst_registry_add_plugin (GstRegistry * registry, GstPlugin * plugin)
|
|||
gst_object_sink (plugin);
|
||||
GST_UNLOCK (registry);
|
||||
|
||||
GST_DEBUG_OBJECT (registry, "emitting plugin-added for filename %s",
|
||||
plugin->filename);
|
||||
GST_DEBUG_OBJECT (registry, "emitting plugin-added for filename \"%s\"",
|
||||
GST_STR_NULL (plugin->filename));
|
||||
g_signal_emit (G_OBJECT (registry), gst_registry_signals[PLUGIN_ADDED], 0,
|
||||
plugin);
|
||||
|
||||
|
@ -701,8 +701,9 @@ gst_registry_scan_path_level (GstRegistry * registry, const gchar * path,
|
|||
continue;
|
||||
}
|
||||
if (plugin->registered) {
|
||||
GST_DEBUG_OBJECT (registry, "plugin already registered from path %s",
|
||||
plugin->filename);
|
||||
GST_DEBUG_OBJECT (registry,
|
||||
"plugin already registered from path \"%s\"",
|
||||
GST_STR_NULL (plugin->filename));
|
||||
g_free (filename);
|
||||
continue;
|
||||
}
|
||||
|
@ -768,8 +769,8 @@ _gst_registry_remove_cache_plugins (GstRegistry * registry)
|
|||
g_next = g->next;
|
||||
plugin = g->data;
|
||||
if (plugin->flags & GST_PLUGIN_FLAG_CACHED) {
|
||||
GST_DEBUG_OBJECT (registry, "removing cached plugin %s",
|
||||
plugin->filename);
|
||||
GST_DEBUG_OBJECT (registry, "removing cached plugin \"%s\"",
|
||||
GST_STR_NULL (plugin->filename));
|
||||
registry->plugins = g_list_remove (registry->plugins, plugin);
|
||||
gst_object_unref (plugin);
|
||||
}
|
||||
|
|
|
@ -4,10 +4,6 @@
|
|||
#include <glib-object.h>
|
||||
#include "../gstelement.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
GstElement *src;
|
||||
GstElement *sink;
|
||||
|
|
|
@ -1104,7 +1104,7 @@ main (int argc, char *argv[])
|
|||
GOptionContext *ctx;
|
||||
GError *err = NULL;
|
||||
|
||||
#ifdef GETTEXT_PACKAGE
|
||||
#ifdef ENABLE_NLS
|
||||
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#endif
|
||||
|
||||
/* FIXME: hack alert */
|
||||
#ifdef _MSC_VER
|
||||
#ifdef WIN32
|
||||
#define DISABLE_FAULT_HANDLER
|
||||
#endif
|
||||
|
||||
|
@ -56,11 +56,11 @@ extern volatile gboolean glib_on_error_halt;
|
|||
static void fault_restore (void);
|
||||
static void fault_spin (void);
|
||||
static void sigint_restore (void);
|
||||
static gboolean caught_intr = FALSE;
|
||||
#endif
|
||||
|
||||
static gint max_iterations = 0;
|
||||
static GstElement *pipeline;
|
||||
static gboolean caught_intr = FALSE;
|
||||
static gboolean caught_error = FALSE;
|
||||
static gboolean tags = FALSE;
|
||||
static gboolean messages = FALSE;
|
||||
|
@ -518,7 +518,7 @@ main (int argc, char *argv[])
|
|||
|
||||
free (malloc (8)); /* -lefence */
|
||||
|
||||
#ifdef GETTEXT_PACKAGE
|
||||
#ifdef ENABLE_NLS
|
||||
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
|
|
Loading…
Reference in a new issue