diff options
author | Alan Fitton <alan@eth0.org.uk> | 2012-06-26 18:12:02 +0100 |
---|---|---|
committer | Alan Fitton <alan@eth0.org.uk> | 2012-06-26 18:12:02 +0100 |
commit | 1ca63e2ab9bdfc1252c1fdd5a864c8db8852d162 (patch) | |
tree | 9ac3f5a07e46013d306954de7818405e260709cd /src | |
parent | 9094eb1fe7d6358db02f6316b5c3c0b49070bcce (diff) |
fix compilation with libappindicator
Diffstat (limited to 'src')
-rw-r--r-- | src/trg-main-window.c | 6 | ||||
-rw-r--r-- | src/trg-peers-model.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 63a6365..bdfc3ee 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -169,7 +169,6 @@ static void trg_main_window_set_property(GObject * object, GParamSpec * pspec); static void quit_cb(GtkWidget * w, gpointer data); static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win); -#ifndef HAVE_LIBAPPINDICATOR static void status_icon_activated(GtkStatusIcon * icon, TrgMainWindow * win); static gboolean trg_status_icon_popup_menu_cb(GtkStatusIcon * icon, @@ -177,7 +176,6 @@ static gboolean trg_status_icon_popup_menu_cb(GtkStatusIcon * icon, static gboolean status_icon_button_press_event(GtkStatusIcon * icon, GdkEventButton * event, TrgMainWindow * win); -#endif static void clear_filter_entry_cb(GtkEntry * entry, GtkEntryIconPosition icon_pos, GdkEvent * event, gpointer user_data); @@ -338,13 +336,11 @@ torrent_event_notification(TrgTorrentModel * model, #endif ); -#ifndef HAVE_LIBAPPINDICATOR #if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7) if (priv->statusIcon && gtk_status_icon_is_embedded(priv->statusIcon)) notify_notification_attach_to_status_icon(notify, priv->statusIcon); #endif -#endif notify_notification_set_urgency(notify, NOTIFY_URGENCY_LOW); notify_notification_set_timeout(notify, tmout); @@ -1791,7 +1787,6 @@ static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win) return menuBar; } -#ifndef HAVE_LIBAPPINDICATOR static void status_icon_activated(GtkStatusIcon * icon G_GNUC_UNUSED, TrgMainWindow * win) @@ -1847,7 +1842,6 @@ status_icon_button_press_event(GtkStatusIcon * icon, return FALSE; } } -#endif static void clear_filter_entry_cb(GtkEntry * entry, diff --git a/src/trg-peers-model.c b/src/trg-peers-model.c index 7de7203..980e2a0 100644 --- a/src/trg-peers-model.c +++ b/src/trg-peers-model.c @@ -250,7 +250,7 @@ static void trg_peers_model_init(TrgPeersModel * self) #ifdef HAVE_GEOIP #ifdef WIN32 geoip_db_path = trg_win32_support_path("GeoIP.dat"); - geoip_v6_db_path = trg_win32_support_path("GeoIP.dat"); + geoip_v6_db_path = trg_win32_support_path("GeoIPv6.dat"); #else geoip_db_path = g_strdup(TRG_GEOIP_DATABASE); geoip_v6_db_path = g_strdup(TRG_GEOIPV6_DATABASE); |