Pidgin

Update of /cvsroot/gaim/gaim/plugins/ticker
In directory sc8-pr-cvs1:/tmp/cvs-serv15123/plugins/ticker

Modified Files:
	gtkticker.c ticker.c 
Log Message:
remove deprecated gtk calls, gtk2-ify log viewer, gtk2-ify jabber vcard
dialog, and probably a cleanup or two I forgot about.


Index: gtkticker.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/ticker/gtkticker.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtkticker.c	2 Jan 2003 05:20:55 -0000	1.3
+++ gtkticker.c	2 Mar 2003 19:21:16 -0000	1.4
@@ -49,26 +49,28 @@
 static GtkContainerClass *parent_class = NULL;
 
 
-GtkType
+GType
 gtk_ticker_get_type (void)
 {
-  static GtkType ticker_type = 0;
+  static GType ticker_type = 0;
 
   if (!ticker_type)
     {
-      static const GtkTypeInfo ticker_info =
+      static const GTypeInfo ticker_info =
       {
-	"GtkTicker",
-	sizeof (GtkTicker),
-	sizeof (GtkTickerClass),
-	(GtkClassInitFunc) gtk_ticker_class_init,
-	(GtkObjectInitFunc) gtk_ticker_init,
-	/* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
+		  sizeof(GtkTickerClass),
+		  NULL,
+		  NULL,
+		  (GClassInitFunc) gtk_ticker_class_init,
+		  NULL,
+		  NULL,
+		  sizeof(GtkTicker),
+		  0,
+		  (GInstanceInitFunc) gtk_ticker_init
       };
 
-      ticker_type = gtk_type_unique (GTK_TYPE_CONTAINER, &ticker_info);
+      ticker_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkTicker",
+			  &ticker_info, 0);
     }
 
   return ticker_type;
@@ -120,10 +122,7 @@
 GtkWidget*
 gtk_ticker_new (void)
 {
-  GtkTicker *ticker;
-
-  ticker = gtk_type_new (GTK_TYPE_TICKER);
-  return GTK_WIDGET (ticker);
+	return GTK_WIDGET(g_object_new(GTK_TYPE_TICKER, NULL));
 }
 
 static void

Index: ticker.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/ticker/ticker.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ticker.c	23 Feb 2003 02:21:15 -0000	1.18
+++ ticker.c	2 Mar 2003 19:21:17 -0000	1.19
@@ -101,7 +101,7 @@
 	if (!ticker)
 		return;
         gtk_ticker_set_spacing( GTK_TICKER( ticker ), 20 );
-        gtk_widget_set_usize( ticker, 500, -1 );
+        gtk_widget_set_size_request( ticker, 500, -1 );
         gtk_container_add( GTK_CONTAINER( tickerwindow ), ticker );
         gtk_ticker_set_interval( GTK_TICKER( ticker ), 500 );
         gtk_ticker_set_scootch( GTK_TICKER( ticker ), 10 );
@@ -215,11 +215,11 @@
 	else
 		return;
 	if ( data->pix == (GtkWidget *) NULL ) {
-		data->pix = gtk_pixmap_new( pm, bm );
+		data->pix = gtk_image_new_from_pixmap( pm, bm );
 		gtk_box_pack_start_defaults( GTK_BOX( data->hbox ), data->pix );
 	} else {
 		gtk_widget_hide( data->pix );
-		gtk_pixmap_set(GTK_PIXMAP(data->pix), pm, bm);
+		gtk_image_set_from_pixmap(GTK_IMAGE(data->pix), pm, bm);
 	}
 	gtk_widget_show( data->pix );
 }