perl-Gtk2 r2132 - in trunk: . t xs

[tsch svn gnome org]

Author: tsch
Date: Fri Feb  6 14:30:10 2009
New Revision: 2132
URL: http://svn.gnome.org/viewvc/perl-Gtk2?rev=2132&view=rev

Log:
Track the recent upstream function renaming:
gtk_entry_get_pixbuf â gtk_entry_get_icon_pixbuf,
gtk_entry_get_stock â gtk_entry_get_icon_stock, and
gtk_entry_get_storage_type â gtk_entry_get_icon_storage_type.


Modified:
   trunk/ChangeLog
   trunk/t/GtkEntry.t
   trunk/xs/GtkEntry.xs

Modified: trunk/t/GtkEntry.t
==============================================================================
--- trunk/t/GtkEntry.t	(original)
+++ trunk/t/GtkEntry.t	Fri Feb  6 14:30:10 2009
@@ -148,8 +148,8 @@
   my $entry = Gtk2::Entry -> new();
 
   is($entry -> get_icon_name($icon_pos), undef);
-  is($entry -> get_pixbuf($icon_pos), undef);
-  is($entry -> get_stock($icon_pos), undef);
+  is($entry -> get_icon_pixbuf($icon_pos), undef);
+  is($entry -> get_icon_stock($icon_pos), undef);
 
   $entry -> set_icon_sensitive($icon_pos, TRUE);
   is($entry -> get_icon_sensitive($icon_pos), TRUE);
@@ -163,33 +163,33 @@
   is($entry -> get_icon_name($icon_pos), undef);
   $entry -> set_icon_from_icon_name($icon_pos, 'gtk-yes');
   is($entry -> get_icon_name($icon_pos), 'gtk-yes');
-  ok($entry -> get_pixbuf($icon_pos));
+  ok($entry -> get_icon_pixbuf($icon_pos));
 
   # Reset through icon_name
   $entry -> set_icon_from_icon_name($icon_pos, undef);
-  is($entry -> get_pixbuf($icon_pos), undef);
+  is($entry -> get_icon_pixbuf($icon_pos), undef);
 
 
 
   # Set and unset the icon through a stock image
   $entry -> set_icon_from_stock($icon_pos, 'gtk-yes');
-  ok($entry -> get_pixbuf($icon_pos));
+  ok($entry -> get_icon_pixbuf($icon_pos));
   $entry -> set_icon_from_stock($icon_pos, undef);
-  is($entry -> get_pixbuf($icon_pos), undef);
+  is($entry -> get_icon_pixbuf($icon_pos), undef);
 
   # Reset
   $entry -> set_icon_from_stock($icon_pos, undef);
   is($entry -> get_icon_name($icon_pos), undef);
-  is($entry -> get_pixbuf($icon_pos), undef);
+  is($entry -> get_icon_pixbuf($icon_pos), undef);
 
 
 
   # Set and unset the icon through a pixbuf
   my $pixbuf = Gtk2::Gdk::Pixbuf->new('rgb', TRUE, 8, 16, 16);
   $entry -> set_icon_from_pixbuf($icon_pos, $pixbuf);
-  is($entry -> get_pixbuf($icon_pos), $pixbuf);
+  is($entry -> get_icon_pixbuf($icon_pos), $pixbuf);
   $entry -> set_icon_from_pixbuf($icon_pos, undef);
-  is($entry -> get_pixbuf($icon_pos), undef);
+  is($entry -> get_icon_pixbuf($icon_pos), undef);
 
 
   # This method can't be tested, at least we call them just in case they crash

Modified: trunk/xs/GtkEntry.xs
==============================================================================
--- trunk/xs/GtkEntry.xs	(original)
+++ trunk/xs/GtkEntry.xs	Fri Feb  6 14:30:10 2009
@@ -245,7 +245,7 @@
 
 gboolean gtk_entry_get_icon_sensitive (GtkEntry *entry, GtkEntryIconPosition icon_pos);
 
-GdkPixbuf_ornull* gtk_entry_get_pixbuf (GtkEntry *entry, GtkEntryIconPosition icon_pos);
+GdkPixbuf_ornull* gtk_entry_get_icon_pixbuf (GtkEntry *entry, GtkEntryIconPosition icon_pos);
 
 gdouble gtk_entry_get_progress_fraction (GtkEntry *entry);
 
@@ -253,9 +253,9 @@
 
 void gtk_entry_progress_pulse (GtkEntry *entry);
 
-const gchar_ornull* gtk_entry_get_stock (GtkEntry *entry, GtkEntryIconPosition icon_pos);
+const gchar_ornull* gtk_entry_get_icon_stock (GtkEntry *entry, GtkEntryIconPosition icon_pos);
 
-GtkImageType gtk_entry_get_storage_type (GtkEntry *entry, GtkEntryIconPosition icon_pos);
+GtkImageType gtk_entry_get_icon_storage_type (GtkEntry *entry, GtkEntryIconPosition icon_pos);
 
 void gtk_entry_set_icon_activatable (GtkEntry *entry, GtkEntryIconPosition icon_pos, gboolean activatable);