Merging github PR #6: Fixes SF #1056, #1089, #1098: Honor preferences…

… when opening links (patch by Daniel Seither)
lwindolf · Jan 13, 2014 · 7d9a1f1 · 7d9a1f1
1 parent 3e136e0
commit 7d9a1f1
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 50 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+To be released
+
+	* Fixes #1056, #1089, #1098: Honor preferences when opening links
+	  (patch by Daniel Seither)
+
+
 2014-01-13   Lars Windolf <[email protected]>
 
 	Version 1.10.4

diff --git a/src/ui/item_list_view.c b/src/ui/item_list_view.c
@@ -76,6 +76,49 @@ enum is_columns {
 	ITEMSTORE_LEN		/**< Number of columns in the itemstore */
 };
 
+typedef enum {
+	DEFAULT,
+	INTERNAL,
+	TAB,
+	EXTERNAL
+} open_link_target_type;
+
+static void
+launch_item_selected (open_link_target_type open_link_target)
+{
+	itemPtr		item;
+
+	item = itemlist_get_selected ();
+	if (item) {
+		gchar *link = item_make_link (item);
+
+		if (link) {
+			switch (open_link_target)
+			{
+			case DEFAULT:
+				itemview_launch_URL (link, FALSE);
+				break;
+			case INTERNAL:
+				itemview_launch_URL (link, TRUE);
+				break;
+			case TAB:
+				browser_tabs_add_new (link, link, FALSE);
+				break;
+			case EXTERNAL:
+				browser_launch_URL_external (link);
+				break;
+			}
+
+			g_free (link);
+		} else
+			ui_show_error_box (_("This item has no link specified!"));
+
+		item_unload (item);
+	} else {
+		liferea_shell_set_important_status_bar (_("No item has been selected"));
+	}
+}
+
 #define ITEM_LIST_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), ITEM_LIST_VIEW_TYPE, ItemListViewPrivate))
 
 struct ItemListViewPrivate {
@@ -606,8 +649,7 @@ on_Itemlist_row_activated (GtkTreeView *treeview,
 			   GtkTreeViewColumn *column,
 			   gpointer user_data) 
 {
-	// FIXME: Internal or external should be decided on preferences!
-	on_popup_launch_item_selected ();
+    launch_item_selected (DEFAULT);
 }
 
 GtkTreeView *
@@ -763,64 +805,19 @@ item_list_view_enable_favicon_column (ItemListView *ilv, gboolean enabled)
 void
 on_popup_launch_item_selected (void) 
 {
-	itemPtr		item;
-
-	item = itemlist_get_selected ();
-	if (item) {
-		gchar *link = item_make_link (item);
-
-		if (link) {
-			itemview_launch_URL (link, TRUE /* launch in internal browser */);
-			g_free (link);
-		} else
-			ui_show_error_box (_("This item has no link specified!"));
-
-		item_unload (item);
-	} else {
-		liferea_shell_set_important_status_bar (_("No item has been selected"));
-	}
+    launch_item_selected (INTERNAL);
 }
 
 void
 on_popup_launch_item_in_tab_selected (void) 
 {
-	itemPtr		item;
-	gchar           *link;
-
-	item = itemlist_get_selected ();
-	if (item) {
-		link = item_make_link (item);
-		if (link) {
-			browser_tabs_add_new (link, link, FALSE);
-			g_free (link);
-		} else
-			ui_show_error_box (_("This item has no link specified!"));
-
-		item_unload (item);
-	} else {
-		liferea_shell_set_important_status_bar (_("No item has been selected"));
-	}
+    launch_item_selected (TAB);
 }
 
 void
 on_popup_launch_item_external_selected (void) 
 {
-	itemPtr		item;
-	gchar           *link;
-
-	item = itemlist_get_selected ();
-	if (item) {
-		link = item_make_link (item);
-		if (link) {
-			browser_launch_URL_external (link);
-			g_free (link);
-		} else
-			ui_show_error_box (_("This item has no link specified!"));
-
-		item_unload (item);
-	} else {
-		liferea_shell_set_important_status_bar (_("No item has been selected"));
-	}
+    launch_item_selected (EXTERNAL);
 }
 
 /* menu callbacks */