diff options
| author |  Alan Fitton <alan@eth0.org.uk> | 2012-06-26 16:03:11 +0100 |
|---|---|---|
| committer | Alan Fitton <alan@eth0.org.uk> | 2012-06-26 16:03:11 +0100 |
| commit | 14bc1b2a0ef89e7ad8c4878108ccbe3665d32096 (patch) | |
| tree | c3f7446c7ba8a107bf5b54d950c694a4624bc7c9 | |
| parent | 0ec76e53cdb0b15da1dd14bb1c53134dc1f3a55b (diff) | |
fix minimise to tray and compiler warning in peers model
| -rw-r--r-- | src/trg-main-window.c | 6 | ||||
| -rw-r--r-- | src/trg-peers-model.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 650e278..6f97a18 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -2379,10 +2379,8 @@ window_state_event(TrgMainWindow * win, TrgPrefs *prefs = trg_client_get_prefs(priv->client); if (priv->statusIcon - && event->changed_mask == GDK_WINDOW_STATE_ICONIFIED - && (event->new_window_state == GDK_WINDOW_STATE_ICONIFIED - || event->new_window_state == - (GDK_WINDOW_STATE_ICONIFIED | GDK_WINDOW_STATE_MAXIMIZED)) + && (event->changed_mask & GDK_WINDOW_STATE_ICONIFIED) + && (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) && trg_prefs_get_bool(prefs, TRG_PREFS_KEY_SYSTEM_TRAY_MINIMISE, TRG_PREFS_GLOBAL)) { gtk_widget_hide(GTK_WIDGET(win)); diff --git a/src/trg-peers-model.c b/src/trg-peers-model.c index f812bee..7de7203 100644 --- a/src/trg-peers-model.c +++ b/src/trg-peers-model.c @@ -225,6 +225,8 @@ static void trg_peers_model_init(TrgPeersModel * self) { #ifdef HAVE_GEOIP TrgPeersModelPrivate *priv = TRG_PEERS_MODEL_GET_PRIVATE(self); + gchar *geoip_db_path = NULL; + gchar *geoip_v6_db_path = NULL; #endif GType column_types[PEERSCOL_COLUMNS]; @@ -247,11 +249,11 @@ static void trg_peers_model_init(TrgPeersModel * self) #ifdef HAVE_GEOIP #ifdef WIN32 - gchar *geoip_db_path = trg_win32_support_path("GeoIP.dat"); - gchar *geoip_v6_db_path = trg_win32_support_path("GeoIP.dat"); + geoip_db_path = trg_win32_support_path("GeoIP.dat"); + geoip_v6_db_path = trg_win32_support_path("GeoIP.dat"); #else - gchar *geoip_db_path = g_strdup(TRG_GEOIP_DATABASE); - gchar *geoip_v6_db_path = g_strdup(TRG_GEOIPV6_DATABASE); + geoip_db_path = g_strdup(TRG_GEOIP_DATABASE); + geoip_v6_db_path = g_strdup(TRG_GEOIPV6_DATABASE); #endif if (g_file_test(geoip_db_path, G_FILE_TEST_EXISTS) == TRUE) |