[Mplayerplug-in-cvs] mplayerplug-in/Source plugin.cpp,1.89,1.90

[Kevin D. <kde...@us...>]

Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6011/Source

Modified Files:
	plugin.cpp 
Log Message:
New Specfiles
Null pointer protection


Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** plugin.cpp	1 Apr 2004 16:08:28 -0000	1.89
--- plugin.cpp	2 Apr 2004 17:51:08 -0000	1.90
***************
*** 881,885 ****
  				signalPlayerThread(this);
  				threadsignaled = 1;
! 			    }
  			}
  			break;
--- 881,892 ----
  				signalPlayerThread(this);
  				threadsignaled = 1;
! 			    } else {
! 				if (showcontrols) {
! 				    panel_height = 16;
! #ifdef GTK_ENABLED
! 				    g_idle_add(gtkgui_draw, this);
! #endif
! 				}
! 			    }			    
  			}
  			break;
***************
*** 1643,1647 ****
  	    if (image != NULL && showlogo)
  		gtk_widget_show(GTK_WIDGET(image));
! 
  	    if (mode == NP_EMBED) {
  		if (movie_height != 0 && movie_width != 0) {
--- 1650,1664 ----
  	    if (image != NULL && showlogo)
  		gtk_widget_show(GTK_WIDGET(image));
! 	    
!    	    if (embed_height > 125) {
! 		gtk_widget_set_usize(GTK_WIDGET(status), embed_width - 20, embed_height - 125);
! 		gtk_fixed_move(GTK_FIXED(fixed_container), GTK_WIDGET(status),
! 				10, 60);
! 	    } else {
! 		gtk_widget_set_usize(GTK_WIDGET(status), embed_width - 20, embed_height - 20);
! 		gtk_fixed_move(GTK_FIXED(fixed_container), GTK_WIDGET(status),
! 				10, 10);
! 	    }
! 	    
  	    if (mode == NP_EMBED) {
  		if (movie_height != 0 && movie_width != 0) {
***************
*** 1769,1776 ****
      showlogo = (int) value;
  #ifdef GTK_ENABLED
!     if (showlogo)
! 	gtk_widget_show(GTK_WIDGET(image));
!     else
! 	gtk_widget_hide(GTK_WIDGET(image));
  
  #endif
--- 1786,1794 ----
      showlogo = (int) value;
  #ifdef GTK_ENABLED
!     if (image != NULL)
! 	if (showlogo)
! 		gtk_widget_show(GTK_WIDGET(image));
! 	else
! 		gtk_widget_hide(GTK_WIDGET(image));
  
  #endif