Changeset 15586 for titan/titan/channellist.h

Timestamp:

05/09/12 01:30:51 (11 years ago)

Author:

nit

Message:

fix

File:

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

titan/titan/channellist.h

@@ -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)
@@ -467 +462 @@
                 tmpstr = ostrcat(tmpstr, _("Move mode"), 1, 0);
                 changetitle(channellist, tmpstr);
-<<<<<<< .mine
                 channellist->fontcol = convercol("mvmode");
-=======
-                channellist->bgcol = convercol("mvmode");
->>>>>>> .r15584
         }
         else if(listmode == RMMODE)
@@ -478 +469 @@
                 tmpstr = ostrcat(tmpstr, _("Remove mode"), 1, 0);
                 changetitle(channellist, tmpstr);
-<<<<<<< .mine
                 channellist->fontcol = convercol("rmmode");
-=======
-                channellist->bgcol = convercol("rmmode");
->>>>>>> .r15584
         }
         else if(listmode == CPMODE)
@@ -489 +476 @@
                 tmpstr = ostrcat(tmpstr, _("Copy mode"), 1, 0);
                 changetitle(channellist, tmpstr);
-<<<<<<< .mine
                 channellist->fontcol = convercol("cpmode");
-=======
-                channellist->bgcol = convercol("cpmode");               
->>>>>>> .r15584
         }
         else if(listmode == PROTECTMODE)
@@ -500 +483 @@
                 tmpstr = ostrcat(tmpstr, _("Protect mode"), 1, 0);
                 changetitle(channellist, tmpstr);
-<<<<<<< .mine
                 channellist->fontcol = convercol("protectmode");
-=======
-                channellist->bgcol = convercol("protectmode");
->>>>>>> .r15584
         }
         else if(listmode == EDITMODE)
@@ -511 +490 @@
                 tmpstr = ostrcat(tmpstr, _("Edit mode"), 1, 0);
                 changetitle(channellist, tmpstr);
-<<<<<<< .mine
                 channellist->fontcol = convercol("editmode");
-=======
-                channellist->bgcol = convercol("editmode");
->>>>>>> .r15584
         }
         else
@@ -521 +496 @@
                 changetitle(channellist, *oldtitle);
                 *oldtitle = NULL;
-<<<<<<< .mine
                 channellist->fontcol = *oldcol;
                 *oldcol = -9999;
-=======
-                channellist->bgcol = *oldcol;
->>>>>>> .r15584
         }
 }