diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-widget.c | 4 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 8 | ||||
| -rw-r--r-- | src/empathy-debug-window.c | 36 | ||||
| -rw-r--r-- | src/empathy.c | 1 |
5 files changed, 47 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5ba9fc487..abb05a4a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl If not 1, append datestamp to the version number -m4_define(empathy_released, 1) +m4_define(empathy_released, 0) m4_define([empathy_major_version], [2]) m4_define([empathy_minor_version], [29]) diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index f4e7de4e1..9cb493fbe 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -701,8 +701,10 @@ contact_widget_location_update (EmpathyContactWidget *information) gtk_container_add (GTK_CONTAINER (information->viewport_map), information->map_view_embed); - g_object_set (G_OBJECT (information->map_view), "show-license", FALSE, + g_object_set (G_OBJECT (information->map_view), + "show-license", TRUE, "scroll-mode", CHAMPLAIN_SCROLL_MODE_KINETIC, + "zoom-level", 10, NULL); layer = champlain_layer_new (); diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index a7f23b2f5..cba102add 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -1828,13 +1828,17 @@ empathy_tp_chat_leave (EmpathyTpChat *self) GArray *array; if (!tp_proxy_has_interface_by_id (priv->channel, - TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) + TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) { empathy_tp_chat_close (self); + return; + } self_handle = tp_channel_group_get_self_handle (priv->channel); - if (self_handle == 0) + if (self_handle == 0) { /* we are not member of the channel */ empathy_tp_chat_close (self); + return; + } array = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1); g_array_insert_val (array, 0, self_handle); diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index f15bb3def..6c0c9c69e 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -1165,6 +1165,37 @@ debug_window_key_press_event_cb (GtkWidget *widget, return FALSE; } +static gboolean +tree_view_search_equal_func_cb (GtkTreeModel *model, + gint column, + const gchar *key, + GtkTreeIter *iter, + gpointer search_data) +{ + gchar *str; + gint key_len; + gint len; + gint i; + gboolean ret = TRUE; /* The return value is counter-intuitive */ + + gtk_tree_model_get (model, iter, column, &str, -1); + + key_len = strlen (key); + len = strlen (str) - key_len; + + for (i = 0; i <= len; ++i) + { + if (!g_ascii_strncasecmp (key, str + i, key_len)) + { + ret = FALSE; + break; + } + } + + g_free (str); + return ret; +} + static GObject * debug_window_constructor (GType type, guint n_construct_params, @@ -1373,6 +1404,11 @@ debug_window_constructor (GType type, gtk_tree_view_set_model (GTK_TREE_VIEW (priv->view), priv->store_filter); + gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->view), + COL_DEBUG_MESSAGE); + gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (priv->view), + tree_view_search_equal_func_cb, NULL, NULL); + /* Scrolled window */ priv->scrolled_win = g_object_ref (gtk_scrolled_window_new (NULL, NULL)); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_win), diff --git a/src/empathy.c b/src/empathy.c index a530b4ae0..2cc5a9f28 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -279,6 +279,7 @@ unique_app_message_cb (UniqueApp *unique_app, gtk_window_set_startup_id (GTK_WINDOW (window), unique_message_data_get_startup_id (data)); gtk_window_present_with_time (GTK_WINDOW (window), timestamp); + gtk_window_set_skip_taskbar_hint (window, FALSE); return UNIQUE_RESPONSE_OK; } |