set minimum dependency versions in RPM spec and configure.ac. gtk 2.16, glib 2.22 (for GResolver), json-glib 0.8.

4 files changed, 33 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index bf30821..05d1a2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,11 +15,11 @@ AC_TYPE_SIZE_T
 
 AM_GCONF_SOURCE_2
 
-PKG_CHECK_MODULES([jsonglib], [json-glib-1.0])
+PKG_CHECK_MODULES([jsonglib], [json-glib-1.0 >= 0.8])
 PKG_CHECK_MODULES([gthread], [gthread-2.0])
 PKG_CHECK_MODULES([gconf], [gconf-2.0])
-PKG_CHECK_MODULES([gtk], [gtk+-2.0])
-PKG_CHECK_MODULES([gio], [gio-2.0])
+PKG_CHECK_MODULES([gtk], [gtk+-2.0 >= 2.16])
+PKG_CHECK_MODULES([gio], [gio-2.0 >= 2.22])
 PKG_CHECK_MODULES([unique], [unique-1.0])
 PKG_CHECK_MODULES([notify], [libnotify])
 LIBCURL_CHECK_CONFIG([yes], [7.0], [], [AC_MSG_ERROR(["libcurl not found"])])
diff --git a/redhat/transmission-remote-gtk.spec b/redhat/transmission-remote-gtk.spec
index 8dd99e9..178951e 100644
--- a/redhat/transmission-remote-gtk.spec
+++ b/redhat/transmission-remote-gtk.spec
@@ -9,12 +9,12 @@ URL: http://code.google.com/p/transmission-remote-gtk/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: gtk2
-Requires: glib2
+Requires: gtk2 >= 2.16
+Requires: glib2 >= 2.22
 Requires: unique
 Requires: GConf2
 Requires: libnotify
-Requires: json-glib
+Requires: json-glib >= 0.8
 Requires: libcurl
 
 BuildRequires: gtk2-devel
@@ -89,6 +89,19 @@ fi
 %{_datadir}/icons/hicolor/48x48/apps/transmission-remote-gtk.png
 
 %changelog
+* Mon Feb 21 2011 Alan Fitton <alan@eth0.org.uk> - 0.2.1
+- Fix crash in update-blocklist/port-test callbacks.
+- Menu bar mnemonics.
+
+* Sat Feb 19 2011 Alan Fitton <alan@eth0.org.uk> - 0.2
+- SSL support.
+- Statistics dialog.
+- Fix for setting low priority files.
+- Port testing.
+- Blocklist settings and updates.
+- Torrent reannounce.
+- Tracker add/edit/delete.
+
 * Mon Feb 07 2011 Alan Fitton <alan@eth0.org.uk> - 0.1.1
 - Squash a couple of nasty first release bugs.
 
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 00bd5ac..734a909 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -105,6 +105,7 @@ static gint confirm_action_dialog(GtkWindow * win,
                                   gchar * action_stock);
 static GtkWidget *my_scrolledwin_new(GtkWidget * child);
 static void view_stats_toggled_cb(GtkWidget * w, gpointer data);
+static void trg_widget_set_visible(GtkWidget *w, gboolean visible);
 static void view_states_toggled_cb(GtkCheckMenuItem * w, gpointer data);
 static void view_notebook_toggled_cb(GtkCheckMenuItem * w, gpointer data);
 static GtkWidget *trg_main_window_notebook_new(TrgMainWindow * win);
@@ -752,17 +753,28 @@ static void view_stats_toggled_cb(GtkWidget * w, gpointer data)
     gtk_widget_show_all(GTK_WIDGET(dlg));
 }
 
+/* gtk_widget_set_sensitive() was introduced in 2.18, we can have a minimum of
+ * 2.16 otherwise. */
+
+static void trg_widget_set_visible(GtkWidget *w, gboolean visible)
+{
+    if (visible)
+        gtk_widget_show(w);
+    else
+        gtk_widget_hide(w);
+}
+
 static void view_states_toggled_cb(GtkCheckMenuItem * w, gpointer data)
 {
     TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data);
-    gtk_widget_set_visible(GTK_WIDGET(priv->stateSelector),
+    trg_widget_set_visible(GTK_WIDGET(priv->stateSelector),
                            gtk_check_menu_item_get_active(w));
 }
 
 static void view_notebook_toggled_cb(GtkCheckMenuItem * w, gpointer data)
 {
     TrgMainWindowPrivate *priv = TRG_MAIN_WINDOW_GET_PRIVATE(data);
-    gtk_widget_set_visible(priv->notebook,
+    trg_widget_set_visible(priv->notebook,
                            gtk_check_menu_item_get_active(w));
 }
 
diff --git a/src/trg-toolbar.c b/src/trg-toolbar.c
index 4924db1..38e47ff 100644
--- a/src/trg-toolbar.c
+++ b/src/trg-toolbar.c
@@ -206,8 +206,6 @@ static void trg_toolbar_init(TrgToolbar * self)
 
     priv = TRG_TOOLBAR_GET_PRIVATE(self);
 
-    gtk_orientable_set_orientation(GTK_ORIENTABLE(self),
-                                   GTK_ORIENTATION_HORIZONTAL);
     gtk_toolbar_set_icon_size(GTK_TOOLBAR(self),
                               GTK_ICON_SIZE_LARGE_TOOLBAR);
     gtk_toolbar_set_style(GTK_TOOLBAR(self), GTK_TOOLBAR_ICONS);