[Gaim-commits] CVS: gaim/src gtkmain.c,1.72,1.73 gtkstatusbox.c,1.107,1.108 savedstatuses.c,1.39,1.40 savedstatuses.h,1.16,1.17

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23248/src

Modified Files:
	gtkmain.c gtkstatusbox.c savedstatuses.c savedstatuses.h 
Log Message:
Don't create duplicate primtive statuses without messages when using
the docklet, either.  And I renamed a function and made it only look
for transient statuses.


Index: gtkmain.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkmain.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -p -r1.72 -r1.73
--- gtkmain.c	10 Feb 2006 21:16:18 -0000	1.72
+++ gtkmain.c	12 Feb 2006 16:30:57 -0000	1.73
@@ -736,7 +736,7 @@ int main(int argc, char *argv[])
 		GaimSavedStatus *saved_status;
 
 		/* If we've used this type+message before, lookup the transient status */
-		saved_status = gaim_savedstatus_find_by_type_and_message(
+		saved_status = gaim_savedstatus_find_transient_by_type_and_message(
 							GAIM_STATUS_OFFLINE, NULL);
 
 		/* If this type+message is unique then create a new transient saved status */

Index: gtkstatusbox.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -p -r1.107 -r1.108
--- gtkstatusbox.c	12 Feb 2006 16:19:21 -0000	1.107
+++ gtkstatusbox.c	12 Feb 2006 16:30:57 -0000	1.108
@@ -1262,7 +1262,7 @@ activate_currently_selected_status(GtkGa
 		if (changed)
 		{
 			/* If we've used this type+message before, lookup the transient status */
-			saved_status = gaim_savedstatus_find_by_type_and_message(
+			saved_status = gaim_savedstatus_find_transient_by_type_and_message(
 										GPOINTER_TO_INT(data), message);
 
 			/* If this type+message is unique then create a new transient saved status */

Index: savedstatuses.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/savedstatuses.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -p -r1.39 -r1.40
--- savedstatuses.c	9 Feb 2006 03:14:59 -0000	1.39
+++ savedstatuses.c	12 Feb 2006 16:30:57 -0000	1.40
@@ -804,8 +804,8 @@ gaim_savedstatus_find_by_creation_time(t
 }
 
 GaimSavedStatus *
-gaim_savedstatus_find_by_type_and_message(GaimStatusPrimitive type,
-										  const char *message)
+gaim_savedstatus_find_transient_by_type_and_message(GaimStatusPrimitive type,
+													const char *message)
 {
 	GList *iter;
 	GaimSavedStatus *status;
@@ -813,7 +813,7 @@ gaim_savedstatus_find_by_type_and_messag
 	for (iter = saved_statuses; iter != NULL; iter = iter->next)
 	{
 		status = (GaimSavedStatus *)iter->data;
-		if ((status->type == type) &&
+		if ((status->type == type) && gaim_savedstatus_is_transient(status) &&
 			(((status->message == NULL) && (message == NULL)) ||
 			((status->message != NULL) && (message != NULL) && !strcmp(status->message, message))))
 		{

Index: savedstatuses.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/savedstatuses.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -p -r1.16 -r1.17
--- savedstatuses.h	4 Feb 2006 21:42:02 -0000	1.16
+++ savedstatuses.h	12 Feb 2006 16:30:57 -0000	1.17
@@ -217,7 +217,7 @@ GaimSavedStatus *gaim_savedstatus_find_b
  *
  * @return The saved status if found, or NULL.
  */
-GaimSavedStatus *gaim_savedstatus_find_by_type_and_message(GaimStatusPrimitive type, const char *message);
+GaimSavedStatus *gaim_savedstatus_find_transient_by_type_and_message(GaimStatusPrimitive type, const char *message);
 
 /**
  * Determines if a given saved status is "transient."