[Gaim-commits] CVS: gaim/plugins/ticker gtkticker.c,1.1,1.2 ticker.c,1.1,1.2

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/plugins/ticker
In directory usw-pr-cvs1:/tmp/cvs-serv15635/plugins/ticker

Modified Files:
	gtkticker.c ticker.c 
Log Message:
some patches from some people.


Index: gtkticker.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/ticker/gtkticker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gtkticker.c	11 Aug 2002 06:42:16 -0000	1.1
+++ gtkticker.c	29 Aug 2002 01:47:13 -0000	1.2
@@ -33,10 +33,6 @@
 				     GtkRequisition   *requisition);
 static void gtk_ticker_size_allocate (GtkWidget        *widget,
 				     GtkAllocation    *allocation);
-static void gtk_ticker_paint         (GtkWidget        *widget,
-				     GdkRectangle     *area);
-static void gtk_ticker_draw          (GtkWidget        *widget,
-				     GdkRectangle     *area);
 static gint gtk_ticker_expose        (GtkWidget        *widget,
 				     GdkEventExpose   *event);
 static void gtk_ticker_add_real      (GtkContainer     *container,
@@ -95,9 +91,6 @@
   widget_class->realize = gtk_ticker_realize;
   widget_class->size_request = gtk_ticker_size_request;
   widget_class->size_allocate = gtk_ticker_size_allocate;
-#if ! GTK_CHECK_VERSION(1,3,0)
-  widget_class->draw = gtk_ticker_draw;
-#endif
   widget_class->expose_event = gtk_ticker_expose;
 
   container_class->add = gtk_ticker_add_real;
@@ -450,45 +443,6 @@
     }
 }
 
-static void
-gtk_ticker_paint (GtkWidget    *widget,
-		 GdkRectangle *area)
-{
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_TICKER (widget));
-  g_return_if_fail (area != NULL);
-
-  if (GTK_WIDGET_DRAWABLE (widget))
-    gdk_window_clear_area (widget->window, 0, 0, widget->allocation.width, 
-	widget->allocation.height);
-}
-
-static void
-gtk_ticker_draw (GtkWidget    *widget,
-		GdkRectangle *area)
-{
-  GtkTicker *ticker;
-  GtkTickerChild *child;
-  GList *children;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_TICKER (widget));
-
-  if (GTK_WIDGET_DRAWABLE (widget))
-    {
-      ticker = GTK_TICKER (widget);
-      gtk_ticker_paint (widget, area);
-
-      children = ticker->children;
-      while (children)
-	{
-	  child = children->data;
-	  children = children->next;
-	    gtk_widget_draw (child->widget, NULL);
-	}
-    }
-}
-
 static gint
 gtk_ticker_expose (GtkWidget *widget, GdkEventExpose *event)
 {
@@ -522,6 +476,7 @@
 
   return FALSE;
 }
+
 
 void       
 gtk_ticker_add(GtkTicker *ticker, GtkWidget *widget)

Index: ticker.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/ticker/ticker.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ticker.c	11 Aug 2002 06:42:16 -0000	1.1
+++ ticker.c	29 Aug 2002 01:47:13 -0000	1.2
@@ -70,7 +70,8 @@
 	userclose = TRUE;
 }
 
-static char *msg = "Welcome to Gaim " VERSION ", brought to you by Rob Flynn (maintainer), Eric Warmenhoven, Mark Spencer, Jeramey Crawford, Jim Duchek, Syd Logan, and Sean Egan"; 
+/* static char *msg = "Welcome to Gaim " VERSION ", brought to you by Rob Flynn (maintainer), Eric Warmenhoven, Mark Spencer, Jeramey Crawford, Jim Duchek, Syd Logan, and Sean Egan"; 
+ */
 
 void
 BuddyTickerCreateWindow()
@@ -112,7 +113,7 @@
 ButtonPressCallback( GtkWidget *widget, GdkEvent *event, gpointer callback_data ) 
 {
 	TickerData *p = (TickerData *) callback_data;
-	struct conversation *conv = new_conversation(p->buddy);
+	new_conversation(p->buddy);
 	
 	return TRUE;
 }