callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just return if the parameters are identical. (#150159, Robert Ögren)

Browse Source 
Tue Aug 24 21:46:42 2004  Søren Sandmann  <sandmann@redhat.com>

	* gtk/gtksequence.c (_gtk_sequence_move): Just return if the
	parameters are identical. (#150159, Robert Ögren)
This commit is contained in:
Søren Sandmann 2004-08-24 19:48:38 +00:00 committed by Søren Sandmann Pedersen
parent 81dba2e0b9
commit f7cbfbae15
5 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Aug 24 21:46:42 2004 Søren Sandmann <sandmann@redhat.com>
* gtk/gtksequence.c (_gtk_sequence_move): Just return if the
parameters are identical. (#150159, Robert Ögren)
2004-08-24 Matthias Clasen <mclasen@redhat.com> 2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle * gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Tue Aug 24 21:46:42 2004 Søren Sandmann <sandmann@redhat.com>
* gtk/gtksequence.c (_gtk_sequence_move): Just return if the
parameters are identical. (#150159, Robert Ögren)
2004-08-24 Matthias Clasen <mclasen@redhat.com> 2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle * gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Tue Aug 24 21:46:42 2004 Søren Sandmann <sandmann@redhat.com>
* gtk/gtksequence.c (_gtk_sequence_move): Just return if the
parameters are identical. (#150159, Robert Ögren)
2004-08-24 Matthias Clasen <mclasen@redhat.com> 2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle * gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Tue Aug 24 21:46:42 2004 Søren Sandmann <sandmann@redhat.com>
* gtk/gtksequence.c (_gtk_sequence_move): Just return if the
parameters are identical. (#150159, Robert Ögren)
2004-08-24 Matthias Clasen <mclasen@redhat.com> 2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle * gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle

17
gtk/gtksequence.c
View File

@ -177,6 +177,7 @@ _gtk_sequence_append (GtkSequence *seq,
last = _gtk_sequence_node_find_last (seq->node); last = _gtk_sequence_node_find_last (seq->node);
_gtk_sequence_node_insert_before (last, node); _gtk_sequence_node_insert_before (last, node);
} }
#if 0
void void
_gtk_sequence_prepend (GtkSequence *seq, _gtk_sequence_prepend (GtkSequence *seq,
@ -192,6 +193,7 @@ _gtk_sequence_prepend (GtkSequence *seq,
_gtk_sequence_node_insert_before (second, node); _gtk_sequence_node_insert_before (second, node);
} }
#endif
GtkSequencePtr GtkSequencePtr
_gtk_sequence_insert (GtkSequencePtr ptr, _gtk_sequence_insert (GtkSequencePtr ptr,
@ -204,8 +206,14 @@ _gtk_sequence_insert (GtkSequencePtr ptr,
node = _gtk_sequence_node_new (data); node = _gtk_sequence_node_new (data);
node->sequence = ptr->sequence; node->sequence = ptr->sequence;
g_print ("%p\n", ptr->sequence);
g_print ("before: %d\n", _gtk_sequence_get_length (ptr->sequence));
_gtk_sequence_node_insert_before (ptr, node); _gtk_sequence_node_insert_before (ptr, node);
g_print ("after: %d\n", _gtk_sequence_get_length (ptr->sequence));
return node; return node;
} }
@ -385,7 +393,10 @@ _gtk_sequence_get_ptr_at_pos (GtkSequence *seq,
len = _gtk_sequence_get_length (seq); len = _gtk_sequence_get_length (seq);
if (pos > len || pos == -1) if (pos > len || pos == -1)
{
g_print ("adjusting pos from %d to %d\n", pos, len);
pos = len; pos = len;
}
return _gtk_sequence_node_find_by_pos (seq->node, pos); return _gtk_sequence_node_find_by_pos (seq->node, pos);
} }
@ -405,6 +416,9 @@ _gtk_sequence_ptr_is_begin (GtkSequencePtr ptr)
return (_gtk_sequence_node_prev (ptr) == ptr); return (_gtk_sequence_node_prev (ptr) == ptr);
} }
/* If you call this on an end pointer you'll get
* the length of the sequence
*/
gint gint
_gtk_sequence_ptr_get_position (GtkSequencePtr ptr) _gtk_sequence_ptr_get_position (GtkSequencePtr ptr)
{ {
@ -1086,6 +1100,9 @@ void
_gtk_sequence_move (GtkSequencePtr ptr, _gtk_sequence_move (GtkSequencePtr ptr,
GtkSequencePtr new_pos) GtkSequencePtr new_pos)
{ {
if (ptr == new_pos)
return;
_gtk_sequence_unlink (ptr->sequence, ptr); _gtk_sequence_unlink (ptr->sequence, ptr);
_gtk_sequence_node_insert_before (new_pos, ptr); _gtk_sequence_node_insert_before (new_pos, ptr);
} }