Merge branch 'gnome-3-8'

[empathy.git] / libempathy-gtk / empathy-search-bar.c

diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index fe5f167a00c6898370cc45eac3b5f28f56b31e2c..dce1bdd1b25713986a54a33a7a364da5a819d0ed 100644 (file)
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -18,27 +18,21 @@
  */
 
 #include "config.h"
+#include "empathy-search-bar.h"
 
-#include <glib.h>
-#include <glib-object.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include <libempathy/empathy-utils.h>
 
-#include "empathy-chat-view.h"
-#include "empathy-search-bar.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathySearchBar)
 
-G_DEFINE_TYPE (EmpathySearchBar, empathy_search_bar, GTK_TYPE_BIN);
+G_DEFINE_TYPE (EmpathySearchBar, empathy_search_bar, GTK_TYPE_BOX);
 
 typedef struct _EmpathySearchBarPriv EmpathySearchBarPriv;
 struct _EmpathySearchBarPriv
 {
-  EmpathyChatView *chat_view;
+  EmpathyThemeAdium *chat_view;
 
   GtkWidget *search_entry;
 
@@ -53,7 +47,7 @@ struct _EmpathySearchBarPriv
 };
 
 GtkWidget *
-empathy_search_bar_new (EmpathyChatView *view)
+empathy_search_bar_new (EmpathyThemeAdium *view)
 {
   EmpathySearchBar *self = g_object_new (EMPATHY_TYPE_SEARCH_BAR, NULL);
 
@@ -62,45 +56,6 @@ empathy_search_bar_new (EmpathyChatView *view)
   return GTK_WIDGET (self);
 }
 
-static void
-empathy_search_bar_get_preferred_height (GtkWidget *widget,
-    gint *minimun_height,
-    gint *natural_height)
-{
-  GtkBin *bin;
-  GtkWidget *child;
-
-  bin = GTK_BIN (widget);
-  child = gtk_bin_get_child (bin);
-
-  if (child && gtk_widget_get_visible (child))
-      gtk_widget_get_preferred_height (child, minimun_height, natural_height);
-}
-
-static void
-empathy_search_bar_size_allocate (GtkWidget *widget,
-    GtkAllocation *allocation)
-{
-  GtkBin *bin;
-  GtkWidget *child;
-  GtkAllocation child_allocation;
-
-  bin = GTK_BIN (widget);
-  child = gtk_bin_get_child (bin);
-
-  gtk_widget_set_allocation (widget, allocation);
-
-  if (child && gtk_widget_get_visible (child))
-    {
-      child_allocation.x = allocation->x;
-      child_allocation.y = allocation->y;
-      child_allocation.width = MAX (allocation->width, 0);
-      child_allocation.height = MAX (allocation->height, 0);
-
-      gtk_widget_size_allocate (child, &child_allocation);
-    }
-}
-
 static void
 empathy_search_bar_update_buttons (EmpathySearchBar *self,
     gchar *search,
@@ -112,7 +67,7 @@ empathy_search_bar_update_buttons (EmpathySearchBar *self,
   EmpathySearchBarPriv* priv = GET_PRIV (self);
 
   /* update previous / next buttons */
-  empathy_chat_view_find_abilities (priv->chat_view, search, match_case,
+  empathy_theme_adium_find_abilities (priv->chat_view, search, match_case,
       &can_go_backward, &can_go_forward);
 
   gtk_widget_set_sensitive (priv->search_previous,
@@ -133,7 +88,7 @@ empathy_search_bar_update (EmpathySearchBar *self)
       GTK_TOGGLE_BUTTON (priv->search_match_case));
 
   /* highlight & search */
-  empathy_chat_view_highlight (priv->chat_view, search, match_case);
+  empathy_theme_adium_highlight (priv->chat_view, search, match_case);
 
   /* update the buttons */
   empathy_search_bar_update_buttons (self, search, match_case);
@@ -160,7 +115,7 @@ empathy_search_bar_hide (EmpathySearchBar *self)
 {
   EmpathySearchBarPriv *priv = GET_PRIV (self);
 
-  empathy_chat_view_highlight (priv->chat_view, "", FALSE);
+  empathy_theme_adium_highlight (priv->chat_view, "", FALSE);
   gtk_widget_hide (GTK_WIDGET (self));
 
   /* give the focus back to the focus-chain with the chat view */
@@ -184,17 +139,17 @@ empathy_search_bar_search (EmpathySearchBar *self,
       GTK_TOGGLE_BUTTON (priv->search_match_case));
 
   /* highlight & search */
-  empathy_chat_view_highlight (priv->chat_view, search, match_case);
+  empathy_theme_adium_highlight (priv->chat_view, search, match_case);
   if (next)
     {
-      found = empathy_chat_view_find_next (priv->chat_view,
+      found = empathy_theme_adium_find_next (priv->chat_view,
           search,
           new_search,
           match_case);
     }
   else
     {
-      found = empathy_chat_view_find_previous (priv->chat_view,
+      found = empathy_theme_adium_find_previous (priv->chat_view,
           search,
           new_search,
           match_case);
@@ -332,7 +287,7 @@ empathy_search_bar_init (EmpathySearchBar * self)
   g_signal_connect (G_OBJECT (self), "key-press-event",
       G_CALLBACK (empathy_search_bar_key_pressed), NULL);
 
-  gtk_container_add (GTK_CONTAINER (self), internal);
+  gtk_box_pack_start (GTK_BOX (self), internal, TRUE, TRUE, 0);
   gtk_widget_show_all (internal);
   gtk_widget_hide (priv->search_not_found);
   g_object_unref (gui);
@@ -342,13 +297,8 @@ static void
 empathy_search_bar_class_init (EmpathySearchBarClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
   g_type_class_add_private (gobject_class, sizeof (EmpathySearchBarPriv));
-
-  /* Neither GtkBin nor GtkContainer seems to do this for us :( */
-  widget_class->get_preferred_height = empathy_search_bar_get_preferred_height;
-  widget_class->size_allocate = empathy_search_bar_size_allocate;
 }
 
 void