Changeset 15585

Timestamp:

05/09/12 01:28:32 (11 years ago)

Author:

obi

Message:

fix

File:

• titan/titan/channellist.h (modified) (9 diffs)

titan/titan/channellist.h

@@ -447 +447 @@
 }
 
-void changechanneltitle(struct skin* channellist, int listmode, char** oldtitle, long** oldcol)
+void changechanneltitle(struct skin* channellist, int listmode, char** oldtitle, long* oldcol)
 {
         char* tmpstr = NULL;
@@ -454 +454 @@
                 *oldtitle = ostrcat(channellist->title, NULL, 0, 0);
 
+<<<<<<< .mine
+        if(*oldcol == -9999)
+                *oldcol = channellist->fontcol;
+=======
         if(*oldcol == NULL)
                 *oldcol = channellist->bgcol;
+>>>>>>> .r15584
 
         if(listmode == MVMODE)
@@ -462 +467 @@
                 tmpstr = ostrcat(tmpstr, _("Move mode"), 1, 0);
                 changetitle(channellist, tmpstr);
+<<<<<<< .mine
+                channellist->fontcol = convercol("mvmode");
+=======
                 channellist->bgcol = convercol("mvmode");
+>>>>>>> .r15584
         }
         else if(listmode == RMMODE)
@@ -469 +478 @@
                 tmpstr = ostrcat(tmpstr, _("Remove mode"), 1, 0);
                 changetitle(channellist, tmpstr);
+<<<<<<< .mine
+                channellist->fontcol = convercol("rmmode");
+=======
                 channellist->bgcol = convercol("rmmode");
+>>>>>>> .r15584
         }
         else if(listmode == CPMODE)
@@ -476 +489 @@
                 tmpstr = ostrcat(tmpstr, _("Copy mode"), 1, 0);
                 changetitle(channellist, tmpstr);
+<<<<<<< .mine
+                channellist->fontcol = convercol("cpmode");
+=======
                 channellist->bgcol = convercol("cpmode");               
+>>>>>>> .r15584
         }
         else if(listmode == PROTECTMODE)
@@ -483 +500 @@
                 tmpstr = ostrcat(tmpstr, _("Protect mode"), 1, 0);
                 changetitle(channellist, tmpstr);
+<<<<<<< .mine
+                channellist->fontcol = convercol("protectmode");
+=======
                 channellist->bgcol = convercol("protectmode");
+>>>>>>> .r15584
         }
         else if(listmode == EDITMODE)
@@ -490 +511 @@
                 tmpstr = ostrcat(tmpstr, _("Edit mode"), 1, 0);
                 changetitle(channellist, tmpstr);
+<<<<<<< .mine
+                channellist->fontcol = convercol("editmode");
+=======
                 channellist->bgcol = convercol("editmode");
+>>>>>>> .r15584
         }
         else
@@ -496 +521 @@
                 changetitle(channellist, *oldtitle);
                 *oldtitle = NULL;
+<<<<<<< .mine
+                channellist->fontcol = *oldcol;
+                *oldcol = -9999;
+=======
                 channellist->bgcol = *oldcol;
+>>>>>>> .r15584
         }
 }
@@ -523 +553 @@
         int nochanneltitle = getskinconfigint("nochanneltitle", NULL);
         int firstdraw = 0;
-        long oldcol = 0;
+        long oldcol = -9999;
         
         status.channelswitch = 1;