Merge lp:~ballogy/gloobus-preview/gio-open-uri into lp:gloobus-preview

[Balló György]

Open URIs with GIO

gnome-open is not available in GNOME 3, so use GIO instead.

=== modified file 'src/gloobus-preview-singleton.cpp'
--- src/gloobus-preview-singleton.cpp	2011-10-31 16:06:58 +0000
+++ src/gloobus-preview-singleton.cpp	2014-12-22 05:45:35 +0000
@@ -149,8 +149,7 @@
 void Gloobus::defaultapp( void )
 {
     //m_gloobus_interface->launch_default_app();
-    string cmd = "gnome-open \"" +  string(m_uri) + "\"" ;
-    g_spawn_command_line_async(cmd.c_str(), NULL);
+    g_app_info_launch_default_for_uri(m_uri, NULL, NULL);
     quit();
 }
 

=== modified file 'src/gloobus-preview-singleton.h'
--- src/gloobus-preview-singleton.h	2011-10-30 20:42:38 +0000
+++ src/gloobus-preview-singleton.h	2014-12-22 05:45:35 +0000
@@ -120,7 +120,6 @@
         void            fullscreen      ( void );
 
         /* launches default application for current file
-         * $ gnome-open <filename>
          * */
         void            defaultapp      ( void );
 

=== modified file 'src/gloobus-preview-window.cpp'
--- src/gloobus-preview-window.cpp	2012-04-06 10:42:24 +0000
+++ src/gloobus-preview-window.cpp	2014-12-22 05:45:35 +0000
@@ -556,16 +556,17 @@
 void GloobusUI::menu_item_cb( GtkMenuItem * item, gpointer data)
 {
     GloobusUI *ui = (GloobusUI*)data;
-    string cmd;
+    string uri;
     string label(gtk_menu_item_get_label(item));
-    if(label ==  _("Settings"))
-        cmd = "gloobus-preview-configuration";
-    else if(label ==  _("Report a Bug"))
-        cmd = "gnome-open \"https://bugs.launchpad.net/gloobus-preview/\"";
+    if(label ==  _("Settings")) {
+        g_spawn_command_line_async("gloobus-preview-configuration", NULL);
+        return;
+    } else if(label ==  _("Report a Problem"))
+        uri = "https://bugs.launchpad.net/gloobus-preview/";
     else if(label == _("Blog"))
-        cmd = "gnome-open \"http://gloobus.wordpress.com\"" ;
+        uri = "http://gloobus.wordpress.com" ;
     else if(label == _("Donate"))
-        cmd = "gnome-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
+        uri = "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars" ;
     else if(label == _("About"))
         ui->create_about();
     else if(label == _("Quit"))
@@ -574,7 +575,7 @@
         g_debug("Uknown menu item label");
         return;
     }
-    g_spawn_command_line_async(cmd.c_str(), NULL);
+    g_app_info_launch_default_for_uri(uri.c_str(), NULL, NULL);
 }
 
 gboolean GloobusUI::focus_out_cb( GtkWidget *widget,

=== modified file 'src/plugin-gstreamer-audio/plugin-gstreamer-audio.cpp'
--- src/plugin-gstreamer-audio/plugin-gstreamer-audio.cpp	2012-04-06 10:42:24 +0000
+++ src/plugin-gstreamer-audio/plugin-gstreamer-audio.cpp	2014-12-22 05:45:35 +0000
@@ -337,10 +337,9 @@
 // ============================ SEARCH LYRICS CB =============================== //
 void iAudio::search_lyrics_cb(GtkWidget *widget, gpointer data)
 {
-    //http://search.mp3lyrics.org/?artist=oasis+&song=don%27t+go+away
+    //http://mp3lyrics.com/Search/Advanced/?Track=don%27t+go+away&Artist=oasis
     iAudio * audio = (iAudio*)data;
-    string url = "http://search.mp3lyrics.org/?artist=" + audio->get_artist() + "&song="+audio->get_title();
-    string cmd = "gnome-open \"" + url + "\"";
-    g_spawn_command_line_async(cmd.c_str(), NULL);
-    g_debug("Searching Lyrics: %s",url.c_str());
+    string uri = "http://mp3lyrics.com/Search/Advanced/?Track="+audio->get_title()+"&Artist=" + audio->get_artist();
+    g_app_info_launch_default_for_uri(uri.c_str(), NULL, NULL);
+    g_debug("Searching Lyrics: %s",uri.c_str());
 }