on second glance, there are even more issues that keep us from working w/2.4. still, 2.6 was released in 2004, so it's not like we're on the bleeding edge here.
This commit is contained in:
parent
4febc1a0dc
commit
ad63c84b47
|
@ -5,8 +5,8 @@ AC_CONFIG_SRCDIR(libtransmission/transmission.h)
|
|||
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
GLIB_MINIMUM=2.4.0
|
||||
GTK_MINIMUM=2.4.0
|
||||
GLIB_MINIMUM=2.6.0
|
||||
GTK_MINIMUM=2.6.0
|
||||
WX_MINIMUM=2.6.0
|
||||
AC_SUBST(GLIB_MINIMUM)
|
||||
AC_SUBST(GTK_MINIMUM)
|
||||
|
|
|
@ -21,12 +21,6 @@
|
|||
#define UNUSED
|
||||
#endif
|
||||
|
||||
#if !GTK_CHECK_VERSION(2,6,0)
|
||||
#define GTK_STOCK_ABOUT NULL
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
extern void doAction (const char * action_name, gpointer user_data );
|
||||
|
||||
static GtkActionGroup * myGroup = 0;
|
||||
|
|
|
@ -163,12 +163,6 @@ hig_message_dialog_set_text (GtkMessageDialog * dialog,
|
|||
const char * primary,
|
||||
const char * secondary)
|
||||
{
|
||||
#if GTK_CHECK_VERSION(2,6,0)
|
||||
gtk_message_dialog_set_markup (dialog, primary);
|
||||
gtk_message_dialog_format_secondary_text (dialog, "%s", secondary);
|
||||
#else
|
||||
char * pch = g_strdup_printf ("<b>%s</b>\n \n%s", primary, secondary);
|
||||
gtk_message_dialog_set_markup (dialog, pch);
|
||||
g_free (pch);
|
||||
#endif
|
||||
}
|
||||
|
|
19
gtk/main.c
19
gtk/main.c
|
@ -888,8 +888,6 @@ getselection( struct cbdata * cbdata )
|
|||
static void
|
||||
about ( void )
|
||||
{
|
||||
#if GTK_CHECK_VERSION(2,6,0)
|
||||
|
||||
GtkWidget * w = gtk_about_dialog_new ();
|
||||
GtkAboutDialog * a = GTK_ABOUT_DIALOG (w);
|
||||
const char *authors[] = { "Eric Petit (Back-end; OS X)",
|
||||
|
@ -909,23 +907,6 @@ about ( void )
|
|||
gtk_about_dialog_set_translator_credits (a, _("translator-credits"));
|
||||
g_signal_connect_swapped (w, "response", G_CALLBACK (gtk_widget_destroy), w);
|
||||
gtk_widget_show_all (w);
|
||||
|
||||
#else
|
||||
|
||||
GtkWidget * w = gtk_message_dialog_new_with_markup(
|
||||
NULL,
|
||||
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||
GTK_MESSAGE_INFO,
|
||||
GTK_BUTTONS_CLOSE,
|
||||
"<b>%s %s</b>\n\n%s\n%s",
|
||||
g_get_application_name(), LONG_VERSION_STRING,
|
||||
"http://transmission.m0k.org/",
|
||||
_("Copyright 2005-2007 The Transmission Project"));
|
||||
g_signal_connect_swapped (w, "response",
|
||||
G_CALLBACK (gtk_widget_destroy), w);
|
||||
gtk_widget_show_all( w );
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -39,11 +39,6 @@
|
|||
|
||||
#define UPDATE_INTERVAL_MSEC 1500
|
||||
|
||||
#if !GTK_CHECK_VERSION(2,6,0)
|
||||
#define GTK_STOCK_FILE NULL
|
||||
#define GTK_STOCK_DIRECTORY NULL
|
||||
#endif
|
||||
|
||||
/****
|
||||
***** PIECES VIEW
|
||||
****/
|
||||
|
|
Loading…
Reference in New Issue