* better action handling

djcb · Jan 22, 2011 · 7356e17 · 7356e17
1 parent a2dbe36
commit 7356e17
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/toys/mug2/mug-msg-view.c b/toys/mug2/mug-msg-view.c
@@ -130,9 +130,7 @@ mug_msg_view_set_msg (MugMsgView * self, const char *msgpath)
 				"<h1>Note</h1><hr>"
 				"<p>Message <tt>%s</tt> does not seem to be present "
 				"on the file system."
-				"<p>Maybe you need to run <tt>mu index</tt>?"
-				"<p>Click <a href=\"cmd:index\">here</a> to start the index"
-				,
+				"<p>Maybe you need to run <tt>mu index</tt>?",
 				msgpath);
 			mu_msg_view_set_note (MU_MSG_VIEW (priv->_view), note);
 			g_free (note);

diff --git a/toys/mug2/mug.cc b/toys/mug2/mug.cc
@@ -223,7 +223,6 @@ on_query_changed (MugQueryBar * bar, const char *query, MugData * mugdata)
 	int count;
 
 	/* clear the old message */
-	//mug_msg_view_set_text (MUG_MSG_VIEW(mugdata->msgview), NULL);
 	mug_msg_view_set_msg (MUG_MSG_VIEW (mugdata->msgview), NULL);
 
 	count = mug_msg_list_view_query (MUG_MSG_LIST_VIEW (mugdata->mlist),
@@ -250,7 +249,6 @@ on_query_changed (MugQueryBar * bar, const char *query, MugData * mugdata)
 static void
 on_msg_selected (MugMsgListView * mlist, const char *mpath, MugData * mugdata)
 {
-	// g_warning ("msg selected: %s", mpath);
 	mug_msg_view_set_msg (MUG_MSG_VIEW (mugdata->msgview), mpath);
 }
 

diff --git a/widgets/mu-msg-body-view.c b/widgets/mu-msg-body-view.c
@@ -226,7 +226,11 @@ on_button_press_event (MuMsgBodyView *self, GdkEventButton *event, gpointer data
     /* ignore all but the first (typically, left) mouse button */
 	switch (event->button) {
 	case 1: return FALSE; /* propagate, let widget handle it */
-	case 3: popup_menu (self, event->button, event->time);
+	case 3:
+		/* no popup menus for internal messages */
+		if (!self->_priv->_internal_msg)
+			popup_menu (self, event->button, event->time);
+		break;
 	default: return TRUE; /* ignore */
 	}