[maemo-commits] [maemo-commits] r15647 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: timj
Date: 2008-06-13 13:39:42 +0300 (Fri, 13 Jun 2008)
New Revision: 15647

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkentry.c
   projects/haf/trunk/gtk+/gtk/gtkentry.h
Log:
2008-06-13 12:33:29  Tim Janik  <timj at imendio.com>

        * gtk/gtkentry.[hc]: introduced hildon_gtk_entry_set_progress_adjustment()
        to set an adjustment as progress indicator on GtkEntry widgets.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2008-06-13 10:32:09 UTC (rev 15646)
+++ projects/haf/trunk/gtk+/ChangeLog	2008-06-13 10:39:42 UTC (rev 15647)
@@ -1,3 +1,8 @@
+2008-06-13 12:33:29  Tim Janik  <timj at imendio.com>
+
+	* gtk/gtkentry.[hc]: introduced hildon_gtk_entry_set_progress_adjustment()
+	to set an adjustment as progress indicator on GtkEntry widgets.
+
 2008-06-13  Michael Natterer  <mitch at imendio.com>
 
 	Fixes: NB#86115: maemo-launcher does not work with
@@ -10,11 +15,6 @@
 	even when gtk_parse_args() has already been called.
 	Patch by Mathias Hasselmann
 
-2008-05-05 13:42:57  Tim Janik  <timj at imendio.com>
-
-	* gtk/gtkentry.c (gtk_entry_set_progress_adjustment): new function to
-	set an adjustment as progress indicator on GtkEntry widgets.
-
 2008-06-09  Kristian Rietveld  <kris at imendio.com>
 
 	* gtk/gtkenums.h:

Modified: projects/haf/trunk/gtk+/gtk/gtkentry.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkentry.c	2008-06-13 10:32:09 UTC (rev 15646)
+++ projects/haf/trunk/gtk+/gtk/gtkentry.c	2008-06-13 10:39:42 UTC (rev 15647)
@@ -1671,6 +1671,7 @@
     }
 }
 
+#ifdef MAEMO_CHANGES
 typedef struct {
   GtkEntry      *entry;
   GtkAdjustment *adjustment;
@@ -1685,9 +1686,19 @@
   g_slice_free (EntryProgressAdjustment, epa);
 }
 
+/**
+ * hildon_gtk_entry_set_progress_adjustment:
+ * @entry:      valid #GtkEntry
+ * @adjustment: valid #GtkAdjustment or %NULL
+ *
+ * Set an adjustment that is used to display progress indicators in the
+ * background of the #GtkEntry. The progress indicator is usually displayed
+ * from left to right, negative adjustment values cause progress indication
+ * from right to left.
+ */
 void
-gtk_entry_set_progress_adjustment (GtkEntry      *entry,
-                                   GtkAdjustment *adjustment)
+hildon_gtk_entry_set_progress_adjustment (GtkEntry      *entry,
+                                          GtkAdjustment *adjustment)
 {
   g_return_if_fail (GTK_IS_ENTRY (entry));
   if (adjustment)
@@ -1728,6 +1739,7 @@
                    &event->area, widget, "bar",
                    0, 0, value * area_width, area_height);
 }
+#endif /* MAEMO_CHANGES */
 
 static gint
 gtk_entry_expose (GtkWidget      *widget,
@@ -1747,7 +1759,9 @@
 			  GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE,
 			  &event->area, widget, "entry_bg",
 			  0, 0, area_width, area_height);
+#ifdef MAEMO_CHANGES
       entry_paint_progress_adjustment (entry, event);
+#endif /* MAEMO_CHANGES */
 
       if (entry->dnd_position != -1)
 	gtk_entry_draw_cursor (GTK_ENTRY (widget), CURSOR_DND);

Modified: projects/haf/trunk/gtk+/gtk/gtkentry.h
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkentry.h	2008-06-13 10:32:09 UTC (rev 15646)
+++ projects/haf/trunk/gtk+/gtk/gtkentry.h	2008-06-13 10:39:42 UTC (rev 15647)
@@ -225,6 +225,8 @@
 void               hildon_gtk_entry_set_input_mode (GtkEntry          *entry,
                                                     HildonGtkInputMode input_mode);
 HildonGtkInputMode hildon_gtk_entry_get_input_mode (GtkEntry          *entry);
+void               hildon_gtk_entry_set_progress_adjustment (GtkEntry      *entry,
+                                                             GtkAdjustment *adjustment);
 #endif /* MAEMO_CHANGES */
 
 G_END_DECLS