Re: [Ekiga-devel-list] Ekiga, opal trunk, gtk+

[Thierry Simonnet <t simonnet esiee fr>]

On 06/03/2010 11:56 AM, Eugen Dedu wrote:
> On 03/06/10 11:35, Thierry Simonnet wrote:
> > Linux + windows :
> > /usr/local/include/opal/opal/connection.h
> > Line 1851 : need to be public.
> >
> > here is the compile log
> > CXX opal-call.lo
> > /usr/local/include/opal/opal/connection.h: In member function 'virtual
> > void Opal::Call::toggle_hold()':
> > /usr/local/include/opal/opal/connection.h:1862: error: 'virtual
> > ptlib_virtual_function_changed_or_removed******
> > OpalConnection::IsConnectionOnHold(bool)' is private
> > ../lib/engine/components/opal/opal-call.cpp:160: error: within this 
> > context
> > ../lib/engine/components/opal/opal-call.cpp:160: warning: 'virtual
> > ptlib_virtual_function_changed_or_removed******
> > OpalConnection::IsConnectionOnHold(bool)' is deprecated (declared at
> > /usr/local/include/opal/opal/connection.h:1862)
> > /usr/local/include/opal/opal/connection.h:1860: error: 'virtual
> > ptlib_virtual_function_changed_or_removed******
> > OpalConnection::HoldConnection()' is private
> > ../lib/engine/components/opal/opal-call.cpp:162: error: within this 
> > context
> > ../lib/engine/components/opal/opal-call.cpp:162: warning: 'virtual
> > ptlib_virtual_function_changed_or_removed******
> > OpalConnection::HoldConnection()' is deprecated (declared at
> > /usr/local/include/opal/opal/connection.h:1860)
> > /usr/local/include/opal/opal/connection.h:1861: error: 'virtual
> > ptlib_virtual_function_changed_or_removed******
> > OpalConnection::RetrieveConnection()' is private
> > ../lib/engine/components/opal/opal-call.cpp:164: error: within this 
> > context
> > ../lib/engine/components/opal/opal-call.cpp:164: warning: 'virtual
> > ptlib_virtual_function_changed_or_removed******
> > OpalConnection::RetrieveConnection()' is deprecated (declared at
> > /usr/local/include/opal/opal/connection.h:1861)
> > ../lib/engine/components/opal/opal-call.cpp:162: warning: ignoring
> > return value of function declared with attribute warn_unused_result
> > ../lib/engine/components/opal/opal-call.cpp:164: warning: ignoring
> > return value of function declared with attribute warn_unused_result
> > /usr/local/include/opal/opal/mediatype.h: At global scope:
> > /usr/local/include/opal/opal/mediatype.h:328: warning:
> > 'PFactoryLoader::T38PseudoRTP_Handler_loader' defined but not used
> > /usr/local/include/opal/rtp/rtp.h:1195: warning:
> > 'PFactoryLoader::RTP_Encoding_loader' defined but not used
> > /usr/local/include/opal/opal/pres_ent.h:688: warning:
> > 'PFactoryLoader::SIPLocal_Presentity_loader' defined but not used
> > /usr/local/include/opal/opal/pres_ent.h:689: warning:
> > 'PFactoryLoader::SIPXCAP_Presentity_loader' defined but not used
> > /usr/local/include/opal/opal/pres_ent.h:690: warning:
> > 'PFactoryLoader::SIPOMA_Presentity_loader' defined but not used
> > /usr/local/include/opal/opal/recording.h:194: warning:
> > 'PFactoryLoader::OpalWAVRecordManager_loader' defined but not used
> > make[3]: *** [opal-call.lo] Error 1
> > make[3]: Leaving directory 
> > `/home/simonnet/Softphone/Devel/Ekiga/ekiga/lib'
> > make[2]: *** [all] Error 2
> > make[2]: Leaving directory 
> > `/home/simonnet/Softphone/Devel/Ekiga/ekiga/lib'
> > make[1]: *** [all-recursive] Error 1
> > make[1]: Leaving directory `/home/simonnet/Softphone/Devel/Ekiga/ekiga'
> > make: *** [all] Error 2
> > bash-4.1# vi /usr/local/include/opal/opal/connection.h
> > reading /usr/local/include/opal/opal/connection.h
>
> This is because we have agreed to use ptlib/opal stbale branch instead 
> of trunk.  So now ekiga compiles with stable, but not with trunk...  
> See http://git.gnome.org/browse/ekiga/commit/?id=b1f97c6b5aba
>
> > -----------------
> > Linux gtk+-2.18.9 :
> > ../lib/.libs/libekiga.so: undefined reference to 
> > `gtk_widget_get_realized'
> > Works only with gtk+-2.20
> > For gtk+-2.18 GTK_WIDGET_REALIZED must be kept.
>
> Thanks, you are right.  I will modify that.  Could you make a patch 
> please?

Here it is in attachment
--

Thierry Simonnet

ESIEE-Paris

Par respect pour l’environnement, n’imprimez ce mail que si nécessaire


--- lib/gui/gmlevelmeter.c_ORI	2010-06-03 13:04:22.000000000 +0200
+++ lib/gui/gmlevelmeter.c	2010-06-03 13:14:26.000000000 +0200
@@ -152,8 +152,12 @@
 
   if (level > lm->peak)
     lm->peak = level;
-
+#if GTK_CHECK_VERSION(2,20,0)
   if (gtk_widget_get_realized (GTK_WIDGET (lm)))
+#else
+  if (GTK_WIDGET_REALIZED (lm))
+#endif
+
     gm_level_meter_paint (lm);
 }
 
@@ -164,7 +168,11 @@
   lm->level = 0;
   lm->peak = 0;
 
+#if GTK_CHECK_VERSION(2,20,0)
   if (gtk_widget_get_realized (GTK_WIDGET (lm)))
+#else
+  if (GTK_WIDGET_REALIZED (lm))
+#endif
     gm_level_meter_paint (lm);
 }
 
@@ -178,7 +186,11 @@
   if (lm->colorEntries) {
 
     /* free old colors, if they have been allocated; delete old array */
+#if GTK_CHECK_VERSION(2,20,0)
     if (gtk_widget_get_realized (GTK_WIDGET (lm)))
+#else
+    if (GTK_WIDGET_REALIZED (lm))
+#endif
       gm_level_meter_free_colors (lm->colorEntries);
     g_array_free (lm->colorEntries, TRUE);
   }
@@ -193,7 +205,11 @@
     g_array_append_val (lm->colorEntries, *entry);
   }
 
+#if GTK_CHECK_VERSION(2,20,0)
   if (gtk_widget_get_realized (GTK_WIDGET (lm))) {
+#else
+  if (GTK_WIDGET_REALIZED (lm)) {
+#endif
 
     gm_level_meter_allocate_colors (lm->colorEntries);
 
@@ -381,7 +397,11 @@
 
   g_return_if_fail (GM_IS_LEVEL_METER (lm));
 
+#if GTK_CHECK_VERSION(2,20,0)
   if (gtk_widget_get_realized (GTK_WIDGET (lm))) {
+#else
+  if (GTK_WIDGET_REALIZED (lm)) {
+#endif
 
     GtkAllocation allocation;
 
@@ -579,7 +599,11 @@
   g_return_if_fail (allocation != NULL);
 
   gtk_widget_set_allocation (widget, allocation);
+#if GTK_CHECK_VERSION(2,20,0)
   if (gtk_widget_get_realized (widget)) {
+#else
+  if (GTK_WIDGET_REALIZED (widget)) {
+#endif
 
     gdk_window_move_resize (gtk_widget_get_window (widget),
                             allocation->x, allocation->y,