diff options
Diffstat (limited to 'src/torrent-cell-renderer.c')
| -rw-r--r-- | src/torrent-cell-renderer.c | 61 |
1 files changed, 10 insertions, 51 deletions
diff --git a/src/torrent-cell-renderer.c b/src/torrent-cell-renderer.c index 95f4d37..1157537 100644 --- a/src/torrent-cell-renderer.c +++ b/src/torrent-cell-renderer.c @@ -13,6 +13,10 @@ /* This cell renderer has been modified heavily to work with the * TrgTorrentModel instead of libtransmission. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <gtk/gtk.h> #include <gdk/gdk.h> #include <glib/gi18n.h> @@ -58,17 +62,10 @@ enum { #define COMPACT_ICON_SIZE GTK_ICON_SIZE_MENU #define FULL_ICON_SIZE GTK_ICON_SIZE_DND -#if GTK_CHECK_VERSION( 3, 0, 0 ) #define FOREGROUND_COLOR_KEY "foreground-rgba" typedef GdkRGBA GtrColor; typedef cairo_t GtrDrawable; typedef GtkRequisition GtrRequisition; -#else -#define FOREGROUND_COLOR_KEY "foreground-gdk" -typedef GdkColor GtrColor; -typedef GdkWindow GtrDrawable; -typedef GdkRectangle GtrRequisition; -#endif /*** **** @@ -329,16 +326,16 @@ static void getStatusString(GString * gstr, TorrentCellRenderer * r) if (priv->fileCount > 0) { g_string_append_printf(gstr, ngettext - ("Downloading from %1$li of %2$li connected peer", - "Downloading from %1$li of %2$li connected peers", + ("Downloading from %1$"G_GUINT64_FORMAT" of %2$"G_GUINT64_FORMAT" connected peer", + "Downloading from %1$"G_GUINT64_FORMAT" of %2$"G_GUINT64_FORMAT" connected peers", priv->webSeedsToUs + priv->peersToUs), priv->webSeedsToUs + priv->peersToUs, priv->webSeedsToUs + priv->connected); } else { g_string_append_printf(gstr, ngettext - ("Downloading metadata from %1$li peer (%2$s done)", - "Downloading metadata from %1$li peers (%2$s done)", + ("Downloading metadata from %1$"G_GUINT64_FORMAT" peer (%2$s done)", + "Downloading metadata from %1$"G_GUINT64_FORMAT" peers (%2$s done)", priv->connected + priv->webSeedsToUs), priv->connected + priv->webSeedsToUs, tr_strlpercent(buf, @@ -348,8 +345,8 @@ static void getStatusString(GString * gstr, TorrentCellRenderer * r) } else if (priv->flags & TORRENT_FLAG_SEEDING) { g_string_append_printf(gstr, ngettext - ("Seeding to %1$li of %2$li connected peer", - "Seeding to %1$li of %2$li connected peers", + ("Seeding to %1$"G_GUINT64_FORMAT" of %2$"G_GUINT64_FORMAT" connected peer", + "Seeding to %1$"G_GUINT64_FORMAT" of %2$"G_GUINT64_FORMAT" connected peers", priv->connected), priv->peersFromUs, priv->connected); } @@ -401,18 +398,8 @@ gtr_cell_renderer_get_preferred_size(GtkCellRenderer * renderer, GtkRequisition * minimum_size, GtkRequisition * natural_size) { -#if GTK_CHECK_VERSION( 3, 0, 0 ) gtk_cell_renderer_get_preferred_size(renderer, widget, minimum_size, natural_size); -#else - GtkRequisition r; - gtk_cell_renderer_get_size(renderer, widget, NULL, NULL, NULL, - &r.width, &r.height); - if (minimum_size) - *minimum_size = r; - if (natural_size) - *natural_size = r; -#endif } static void @@ -462,8 +449,6 @@ get_size_compact(TorrentCellRenderer * cell, g_object_unref(icon); } -#define MAX3(a,b,c) MAX(a,MAX(b,c)) - static void get_size_full(TorrentCellRenderer * cell, GtkWidget * widget, gint * width, gint * height) @@ -526,11 +511,7 @@ get_size_full(TorrentCellRenderer * cell, static void torrent_cell_renderer_get_size(GtkCellRenderer * cell, GtkWidget * widget, -#if GTK_CHECK_VERSION( 3,0,0 ) const GdkRectangle * cell_area, -#else - GdkRectangle * cell_area, -#endif gint * x_offset, gint * y_offset, gint * width, gint * height) @@ -570,7 +551,6 @@ get_text_color(TorrentCellRenderer * r, GtkWidget * widget, GtrColor * setme) { struct TorrentCellRendererPrivate *p = r->priv; -#if GTK_CHECK_VERSION( 3,0,0 ) static const GdkRGBA red = { 1.0, 0, 0, 0 }; if (p->error) @@ -581,16 +561,6 @@ get_text_color(TorrentCellRenderer * r, GtkWidget * widget, else gtk_style_context_get_color(gtk_widget_get_style_context(widget), GTK_STATE_FLAG_NORMAL, setme); -#else - static const GdkColor red = { 0, 65535, 0, 0 }; - - if (p->error) - *setme = red; - else if (p->flags & TORRENT_FLAG_PAUSED) - *setme = gtk_widget_get_style(widget)->text[GTK_STATE_INSENSITIVE]; - else - *setme = gtk_widget_get_style(widget)->text[GTK_STATE_NORMAL]; -#endif } static double get_percent_done(TorrentCellRenderer * r, gboolean * seed) @@ -623,26 +593,15 @@ gtr_cell_renderer_render(GtkCellRenderer * renderer, const GdkRectangle * area, GtkCellRendererState flags) { -#if GTK_CHECK_VERSION( 3, 0, 0 ) gtk_cell_renderer_render(renderer, drawable, widget, area, area, flags); -#else - gtk_cell_renderer_render(renderer, drawable, widget, area, area, area, - flags); -#endif } static void torrent_cell_renderer_render(GtkCellRenderer * cell, GtrDrawable * window, GtkWidget * widget, -#if GTK_CHECK_VERSION( 3,0,0 ) const GdkRectangle * background_area, const GdkRectangle * cell_area, -#else - GdkRectangle * background_area, - GdkRectangle * cell_area, - GdkRectangle * expose_area, -#endif GtkCellRendererState flags) { TorrentCellRenderer *self = TORRENT_CELL_RENDERER(cell); |