[gitg] GtkEntry instead of sexy-icon-entry.



commit e3c4fb6594a8437adcb1146feb75a66d2f0f4fa0
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Apr 21 12:48:33 2009 +0200

    GtkEntry instead of sexy-icon-entry.
    
    Remove SexyIconEntry and use GtkEntry instead.

 gitg/Makefile.am       |    4 +-
 gitg/gitg-window.c     |   10 +-
 gitg/gitg.c            |    1 -
 gitg/sexy-icon-entry.c |  968 ------------------------------------------------
 gitg/sexy-icon-entry.h |  101 -----
 5 files changed, 5 insertions(+), 1079 deletions(-)
---
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index f073027..a7961fb 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -44,8 +44,7 @@ NOINST_H_FILES = 			\
 	gitg-spinner.h			\
 	gitg-types.h			\
 	gitg-utils.h			\
-	gitg-window.h			\
-	sexy-icon-entry.h
+	gitg-window.h
 
 gitg_SOURCES = 				\
 	$(BUILT_SOURCES)		\
@@ -79,7 +78,6 @@ gitg_SOURCES = 				\
 	gitg-spinner.c			\
 	gitg-utils.c			\
 	gitg-window.c			\
-	sexy-icon-entry.c		\
 	$(NOINST_H_FILES)
 
 ENUM_H_FILES =				\
diff --git a/gitg/gitg-window.c b/gitg/gitg-window.c
index 6212a73..6537207 100644
--- a/gitg/gitg-window.c
+++ b/gitg/gitg-window.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <glib/gi18n.h>
 
-#include "sexy-icon-entry.h"
 #include "config.h"
 
 #include "gitg-dirs.h"
@@ -203,7 +202,7 @@ on_selection_changed(GtkTreeSelection *selection, GitgWindow *window)
 }
 
 static void
-on_search_icon_pressed(SexyIconEntry *entry, SexyIconEntryPosition icon_pos, int button, GitgWindow *window)
+on_search_icon_release(GtkEntry *entry, GtkEntryIconPosition icon_pos, int button, GitgWindow *window)
 {
 	gtk_menu_popup(GTK_MENU(window->priv->search_popup), NULL, NULL, NULL, NULL, button, gtk_get_current_event_time());
 }
@@ -289,10 +288,9 @@ static void
 build_search_entry(GitgWindow *window, GtkBuilder *builder)
 {
 	GtkWidget *box = GTK_WIDGET(gtk_builder_get_object(builder, "hbox_top"));
-	GtkWidget *entry = sexy_icon_entry_new();
+	GtkWidget *entry = gtk_entry_new ();
 
-	GtkImage *image = GTK_IMAGE(gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU));
-	sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(entry), SEXY_ICON_ENTRY_PRIMARY, image);
+	gtk_entry_set_icon_from_stock(GTK_ENTRY(entry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
 
 	gtk_tree_view_set_search_entry(window->priv->tree_view, GTK_ENTRY(entry));
 	gtk_widget_show(entry);
@@ -300,7 +298,7 @@ build_search_entry(GitgWindow *window, GtkBuilder *builder)
 
 	window->priv->search_popup = GTK_WIDGET(g_object_ref(gtk_ui_manager_get_widget(window->priv->menus_ui_manager, "/ui/search_popup")));
 
-	g_signal_connect(entry, "icon-pressed", G_CALLBACK(on_search_icon_pressed), window);
+	g_signal_connect(entry, "icon-release", G_CALLBACK(on_search_icon_release), window);
 	gtk_tree_view_set_search_column(window->priv->tree_view, 1);
 
 	gtk_tree_view_set_search_equal_func(window->priv->tree_view, search_equal_func, window, NULL);
diff --git a/gitg/gitg.c b/gitg/gitg.c
index 7651bf4..81b929e 100644
--- a/gitg/gitg.c
+++ b/gitg/gitg.c
@@ -30,7 +30,6 @@
 
 #include "gitg-debug.h"
 #include "gitg-window.h"
-#include "sexy-icon-entry.h"
 #include "config.h"
 #include "gitg-settings.h"
 #include "gitg-dirs.h"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]