replace ambiguous NULL pointers for g_object.

2 files changed, 11 insertions, 4 deletions

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index a9e0004..259f903 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -130,7 +130,7 @@ LLMediaImplGStreamer () :
                         return; // error
                 }
 
-                g_object_set(mPlaybin, "video-sink", mVideoSink, NULL);
+                g_object_set(mPlaybin, "video-sink", mVideoSink, (void*)NULL);
         }
 }
 
@@ -591,7 +591,7 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
         setStatus( LLMediaBase::STATUS_NAVIGATING );
 
         // set URI
-        g_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), NULL);
+        g_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), (void*)NULL);
 
         // get playbin's bus - perhaps this can/should be done in ctor
         GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (mPlaybin));
@@ -917,7 +917,7 @@ bool LLMediaImplGStreamer::setVolume(float volume)
         mVolume = volume;
         if (mPlaybin)
         {
-                g_object_set(mPlaybin, "volume", mVolume, NULL);
+                g_object_set(mPlaybin, "volume", mVolume, (void*)NULL);
                 return true;
         }
 
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index a844f81..4372053 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -464,8 +464,15 @@ bool LLAppViewerLinux::initSLURLHandler()
         LL_DEBUGS("DBUS")<< "Debug DBUS Start"<< LL_ENDL;
 
         //ViewerAppAPI *api_server = (ViewerAppAPI*)
-        g_object_new(viewerappapi_get_type(), NULL);
 
+        g_object_new(viewerappapi_get_type(), NULL, (void*)NULL);
+///     also possible instead:
+/*      GType obj_type = viewerappapi_get_type();
+        g_object_newv(obj_type, 0, NULL);       //gpointer g_object_newv  (GType object_type,
+                                                //                              guint n_parameters,
+                                                //                              GParameter *parameters);
+
+*/
         return true;
 }