gnome-terminal r3000 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Sat Aug 23 19:17:38 2008
New Revision: 3000
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3000&view=rev

Log:
Require gtk 2.13.

Modified:
   trunk/configure.ac
   trunk/src/terminal-util.c
   trunk/src/terminal-window.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Aug 23 19:17:38 2008
@@ -35,7 +35,7 @@
 AM_GLIB_GNU_GETTEXT
 
 GLIB_REQUIRED=2.16.0
-GTK_REQUIRED=2.12.0
+GTK_REQUIRED=2.13.6
 GCONF_REQUIRED=2.14.0
 STARTUP_NOTIFICATION_REQUIRED=0.8
 VTE_REQUIRED=0.17.0

Modified: trunk/src/terminal-util.c
==============================================================================
--- trunk/src/terminal-util.c	(original)
+++ trunk/src/terminal-util.c	Sat Aug 23 19:17:38 2008
@@ -167,9 +167,7 @@
 {
   GError *error = NULL;
   char *uri;
-#if GTK_CHECK_VERSION (2, 13, 0)
   GdkAppLaunchContext *context;
-#endif
 
   g_return_if_fail (orig_url != NULL);
 
@@ -193,7 +191,6 @@
       g_assert_not_reached ();
     }
 
-#if GTK_CHECK_VERSION (2, 13, 0)
   context = gdk_app_launch_context_new ();
   gdk_app_launch_context_set_timestamp (context, user_time);
 
@@ -204,9 +201,6 @@
 
   g_app_info_launch_default_for_uri (uri, G_APP_LAUNCH_CONTEXT (context), &error);
   g_object_unref (context);
-#else
-  g_app_info_launch_default_for_uri (uri, NULL, &error);
-#endif
 
   if (error)
     {

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Sat Aug 23 19:17:38 2008
@@ -2689,20 +2689,11 @@
 
 static void
 clipboard_uris_received_cb (GtkClipboard *clipboard,
-#if GTK_CHECK_VERSION (2, 13, 4)
                             char **uris,
-#else
-                            GtkSelectionData *selection_data,
-#endif /* GTK 2.13.4 */
                             PasteData *data)
 {
   char *text;
   gsize len;
-#if !GTK_CHECK_VERSION (2, 13, 4)
-  char **uris;
-
-  uris = gtk_selection_data_get_uris (selection_data);
-#endif /* ! GTK 2.13.4 */
 
   if (!uris) {
     g_object_unref (data->screen);
@@ -2736,16 +2727,9 @@
   }
 
   if (gtk_targets_include_uri (targets, n_targets)) {
-#if GTK_CHECK_VERSION (2, 13, 4)
     gtk_clipboard_request_uris (clipboard,
                                 (GtkClipboardURIReceivedFunc) clipboard_uris_received_cb,
                                 data);
-#else
-    gtk_clipboard_request_contents (clipboard,
-                                    gdk_atom_intern ("text/uri-list", FALSE),
-                                    (GtkClipboardReceivedFunc) clipboard_uris_received_cb,
-                                    data);
-#endif /* GTK 2.13.4 */
     return;
   } else /* if (gtk_targets_include_text (targets, n_targets)) */ {
     vte_terminal_paste_clipboard (VTE_TERMINAL (data->screen));