Use system flag icon, therefore removing the redundant instance in kmail...

svn path=/trunk/KDE/kdepim/kmail/pics/; revision=420996

kmheaders.cpp

@@ -150,7 +150,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, QWidget *parent,
     pixTodo                  = new QPixmap( UserIcon( "kmmsgtodo"                  ) );
     pixSent                  = new QPixmap( UserIcon( "kmmsgsent"                  ) );
     pixFwd                   = new QPixmap( UserIcon( "kmmsgforwarded"             ) );
-    pixFlag                  = new QPixmap( UserIcon( "kmmsgflag"                  ) );
+    pixFlag                  = new QPixmap( UserIcon( "flag"                  ) );
     pixWatched               = new QPixmap( UserIcon( "kmmsgwatched"               ) );
     pixIgnored               = new QPixmap( UserIcon( "kmmsgignored"               ) );
     pixSpam                  = new QPixmap( UserIcon( "mark_as_spam"                  ) );

kmmainwidget.cpp

@@ -2503,7 +2503,7 @@ void KMMainWidget::setupActions()
   mStatusMenu->insert( new KActionSeparator( this ) );
 
   // -------- Toggle Actions
-  mToggleFlagAction = new KToggleAction(i18n("Mark Message as &Important"), "kmmsgflag",
+  mToggleFlagAction = new KToggleAction(i18n("Mark Message as &Important"), "flag",
                                  0, this, SLOT(slotSetMsgStatusFlag()),
                                  actionCollection(), "status_flag");
   mToggleFlagAction->setCheckedState( i18n("Remove &Important Message Mark") );
@@ -2577,7 +2577,7 @@ void KMMainWidget::setupActions()
   mThreadStatusMenu->insert( new KActionSeparator( this ) );
 
   //----- "Mark Thread" toggle actions
-  mToggleThreadFlagAction = new KToggleAction(i18n("Mark Thread as &Important"), "kmmsgflag",
+  mToggleThreadFlagAction = new KToggleAction(i18n("Mark Thread as &Important"), "flag",
                                        0, this, SLOT(slotSetThreadStatusFlag()),
                                        actionCollection(), "thread_flag");
   mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") );

kmsearchpattern.h

@@ -219,7 +219,7 @@ namespace KMail {
   };
 
   static const MessageStatus StatusValues[] = {
-    { I18N_NOOP( "Important" ),        "kmmsgflag"   },
+    { I18N_NOOP( "Important" ),        "flag"   },
     { I18N_NOOP( "New" ),              "kmmsgnew"   },
     { I18N_NOOP( "Unread" ),           "kmmsgunseen"   },
     { I18N_NOOP( "Read" ),             "kmmsgread"   },

pics/Makefile.am

@@ -1,7 +1,7 @@
 SUBDIRS = icons
 
 pics_DATA = kmmsgdel.png kmmsgnew.png kmmsgunseen.png kmmsgread.png \
-	kmmsgreplied.png kmmsgforwarded.png kmmsgqueued.png kmmsgflag.png \
+	kmmsgreplied.png kmmsgforwarded.png kmmsgqueued.png \
 	kmmsgsent.png kmmsgwatched.png kmmsgignored.png kmmsgtodo.png \
 	kmmsgread_fwd.png kmmsgread_replied.png kmmsgread_fwd_replied.png \
 	pgp-keys.png \