Merge lp:~fjkong/gnome-terminal/gnome-terminal into lp:gnome-terminal

[FanJun Kong - ( BH1SCW )]

add search on google to right click menu

add search on google to right click menu

Unmerged revisions

5100. By FanJun Kong - ( BH1SCW ) on 2014-10-12

add search by google to right click menu

=== modified file 'src/terminal-util.c'
--- src/terminal-util.c	2014-03-03 20:41:33 +0000
+++ src/terminal-util.c	2014-10-12 12:59:18 +0000
@@ -112,7 +112,7 @@
     }
 }
 
-static gboolean
+gboolean
 open_url (GtkWindow *parent,
           const char *uri,
           guint32 user_time,

=== modified file 'src/terminal-util.h'
--- src/terminal-util.h	2014-07-03 09:24:07 +0000
+++ src/terminal-util.h	2014-10-12 12:59:18 +0000
@@ -40,6 +40,10 @@
 void terminal_util_set_atk_name_description (GtkWidget  *widget,
                                              const char *name,
                                              const char *desc);
+gboolean open_url (GtkWindow *parent,
+                   const char* uri,
+                   guint32 user_time,
+                   GError **error);
 
 void terminal_util_open_url (GtkWidget *parent,
                              const char *orig_url,

=== modified file 'src/terminal-window.c'
--- src/terminal-window.c	2014-08-21 17:29:40 +0000
+++ src/terminal-window.c	2014-10-12 12:59:18 +0000
@@ -1923,6 +1923,20 @@
 }
 
 static void
+search_on_google_callback (GtkAction *action,
+							TerminalWindow *window)
+{
+    gchar *url;
+    GtkClipboard *clipboard;
+
+    clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_PRIMARY);
+    url = g_strdup_printf ("http://www.google.com/search?ie=UTF-8&q=%s",  gtk_clipboard_wait_for_text(clipboard));
+    open_url (GTK_WINDOW (window), url, gtk_get_current_event_time (), NULL);
+
+   g_free(url);
+}
+
+static void
 popup_leave_fullscreen_callback (GtkAction *action,
                                  TerminalWindow *window)
 {
@@ -2028,6 +2042,9 @@
   gtk_action_set_visible (action, show_link);
   action = gtk_action_group_get_action (priv->action_group, "PopupCopyLinkAddress");
   gtk_action_set_visible (action, show_link);
+  action = gtk_action_group_get_action (priv->action_group, "PopupSearchOnGoogle");
+  gtk_action_set_visible (action, vte_terminal_get_has_selection (VTE_TERMINAL (screen)));
+
 
   action = gtk_action_group_get_action (priv->action_group, "PopupCopy");
   gtk_action_set_sensitive (action, vte_terminal_get_has_selection (VTE_TERMINAL (screen)));
@@ -2511,6 +2528,9 @@
       { "PopupCopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
         NULL,
         G_CALLBACK (popup_copy_url_callback) },
+      { "PopupSearchOnGoogle", NULL, N_("_Search On Google"), NULL,
+        NULL,
+        G_CALLBACK (search_on_google_callback) },
       { "PopupTerminalProfiles", NULL, N_("P_rofiles") },
       { "PopupCopy", "edit-copy", N_("Copy"), "",
         NULL,

=== modified file 'src/terminal.xml'
--- src/terminal.xml	2014-04-18 09:43:39 +0000
+++ src/terminal.xml	2014-10-12 12:59:18 +0000
@@ -82,6 +82,7 @@
     <menuitem action="PopupCopyCallAddress" />
     <menuitem action="PopupOpenLink" />
     <menuitem action="PopupCopyLinkAddress" />
+    <menuitem action="PopupSearchOnGoogle" />
     <separator />
     <menuitem action="PopupNewTerminal" />
     <separator />