GNOME.org
 

[gnome-utils] [gsearchtool] Bug 573670

commit edb09921be5fb5b883b8c19333a8d31ac53875b4
Author: Dennis Cranston <Dennis_Cranston yahoo com>
Date:   Sun May 17 22:22:26 2009 -0700

    [gsearchtool] Bug 573670
    
    Remove use of libgnomeui (gnome-client & gnome-entry)
---
 Makefile.am                         |    1 +
 configure.ac                        |   11 ++------
 gsearchtool/Makefile.am             |   17 ++++++++----
 gsearchtool/gsearchtool-callbacks.c |   17 ++++--------
 gsearchtool/gsearchtool-callbacks.h |   14 ++++------
 gsearchtool/gsearchtool-support.c   |    3 +-
 gsearchtool/gsearchtool.c           |   45 +++++++++++++++-------------------
 gsearchtool/gsearchtool.h           |    1 +
 8 files changed, 49 insertions(+), 60 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a9144b8..4e772c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = \
 	m4			\
 	po			\
+	libeggsmclient		\
 	baobab			\
 	gnome-dictionary	\
 	gnome-screenshot	\
diff --git a/configure.ac b/configure.ac
index 4e7ba71..6380ddf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,8 +72,6 @@ GLIB_REQUIRED=2.20.0
 GIO_REQUIRED=2.16.0
 GTK_REQUIRED=2.16.0
 GIO_UNIX_REQUIRED=2.18.0
-LIBGNOME_REQUIRED=2.13.2
-LIBGNOMEUI_REQUIRED=2.13.7
 LIBPANEL_APPLET_REQUIRED=2.13.4
 LIBGTOP_REQUIRED=2.12.0
 
@@ -85,12 +83,6 @@ PKG_CHECK_MODULES(GNOME_UTILS, glib-2.0 >= $GLIB_REQUIRED dnl
 AC_SUBST(GNOME_UTILS_CFLAGS)
 AC_SUBST(GNOME_UTILS_LIBS)
 
-# separate check for libgnome/libgnomeui, so that we can easily
-# remove the variables
-PKG_CHECK_MODULES(LIBGNOME, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
-AC_SUBST(LIBGNOME_CFLAGS)
-AC_SUBST(LIBGNOME_LIBS)
-
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
@@ -346,6 +338,8 @@ AC_CONFIG_FILES([
 
         po/Makefile.in
 
+        libeggsmclient/Makefile
+
         baobab/Makefile
         baobab/data/Makefile
         baobab/pixmaps/Makefile
@@ -362,6 +356,7 @@ AC_CONFIG_FILES([
         gsearchtool/Makefile
         gsearchtool/data/Makefile
         gsearchtool/help/Makefile
+        gsearchtool/libgnomeui-deprecated/Makefile
 
         gnome-dictionary/Makefile
         gnome-dictionary/libgdict/Makefile
diff --git a/gsearchtool/Makefile.am b/gsearchtool/Makefile.am
index 799f2fc..f9f42ea 100644
--- a/gsearchtool/Makefile.am
+++ b/gsearchtool/Makefile.am
@@ -1,17 +1,21 @@
 Utilitiesdir = $(datadir)/applications
 
-SUBDIRS = data help
+SUBDIRS = data help libgnomeui-deprecated
 
 INCLUDES = 	\
 	$(GNOME_UTILS_CFLAGS)					\
 	$(GIO_UNIX_CFLAGS)					\
-	$(LIBGNOME_CFLAGS)					\
+	-I$(srcdir)/libgnomeui-deprecated			\
+	-I$(top_builddir)/libeggsmclient			\
 	-DG_DISABLE_DEPRECATED					\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
 	-DLOCALEDIR=\"$(datadir)/locale\"			\
 	-DDATADIR=\""$(datadir)"\"				\
 	-DGREP_COMMAND=\""$(GREP_COMMAND)"\"
 
+libgnomeui_deprecated_LIB = $(srcdir)/libgnomeui-deprecated/libgnomeui-deprecated.la
+libeggsmclient_LIB = $(top_builddir)/libeggsmclient/libeggsmclient.la
+
 bin_PROGRAMS = gnome-search-tool
 
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
@@ -29,10 +33,11 @@ gnome_search_tool_SOURCES =     \
 	gsearchtool.c	        \
 	gsearchtool.h
 
-gnome_search_tool_LDADD =   \
-	$(LIBGNOME_LIBS)    \
-	$(GNOME_UTILS_LIBS) \
-	$(GIO_UNIX_LIBS)
+gnome_search_tool_LDADD =            \
+	$(GNOME_UTILS_LIBS)          \
+	$(GIO_UNIX_LIBS)             \
+	$(libgnomeui_deprecated_LIB) \
+	$(libeggsmclient_LIB)
 
 man_MANS = gnome-search-tool.1
 
diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/gsearchtool-callbacks.c
index 6c604ad..c53d7ef 100644
--- a/gsearchtool/gsearchtool-callbacks.c
+++ b/gsearchtool/gsearchtool-callbacks.c
@@ -37,7 +37,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#include <gnome.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "gsearchtool.h"
 #include "gsearchtool-callbacks.h"
@@ -94,8 +94,8 @@ quit_application (GSearchWindow * gsearch)
 }
 
 void
-die_cb (GnomeClient * client,
-	gpointer data)
+quit_session_cb (EggSMClient * client,
+                 gpointer data)
 {
 	quit_application ((GSearchWindow *) data);
 }
@@ -1765,12 +1765,8 @@ save_results_cb (GtkWidget * chooser,
 }
 
 void
-save_session_cb (GnomeClient * client,
-                 gint phase,
-                 GnomeRestartStyle save_style,
-                 gint shutdown,
-                 GnomeInteractStyle interact_style,
-                 gint fast,
+save_session_cb (EggSMClient * client,
+                 GKeyFile * state_file,
                  gpointer client_data)
 {
 	GSearchWindow * gsearch = client_data;
@@ -1778,8 +1774,7 @@ save_session_cb (GnomeClient * client,
 	int argc;
 
 	set_clone_command (gsearch, &argc, &argv, "gnome-search-tool", FALSE);
-	gnome_client_set_clone_command (client, argc, argv);
-	gnome_client_set_restart_command (client, argc, argv);
+	egg_sm_client_set_restart_command (client, argc, (const char **) argv);
 }
 
 gboolean
diff --git a/gsearchtool/gsearchtool-callbacks.h b/gsearchtool/gsearchtool-callbacks.h
index 829e6b7..604eed6 100644
--- a/gsearchtool/gsearchtool-callbacks.h
+++ b/gsearchtool/gsearchtool-callbacks.h
@@ -33,9 +33,11 @@ extern "C" {
 #pragma }
 #endif
 
+#include "eggsmclient.h"
+
 void
-die_cb (GnomeClient * client,
-        gpointer data);
+quit_session_cb (EggSMClient * client,
+                 gpointer data);
 void
 quit_cb (GtkWidget * widget,
          GdkEvent * event,
@@ -116,12 +118,8 @@ save_results_cb (GtkWidget * chooser,
                  gint response,
                  gpointer data);
 void
-save_session_cb (GnomeClient * client,
-                 gint phase,
-                 GnomeRestartStyle save_style,
-                 gint shutdown,
-                 GnomeInteractStyle interact_style,
-                 gint fast,
+save_session_cb (EggSMClient * client,
+                 GKeyFile * state_file,
                  gpointer client_data);
 gboolean
 key_press_cb (GtkWidget * widget,
diff --git a/gsearchtool/gsearchtool-support.c b/gsearchtool/gsearchtool-support.c
index e573015..0e1bc46 100644
--- a/gsearchtool/gsearchtool-support.c
+++ b/gsearchtool/gsearchtool-support.c
@@ -33,12 +33,11 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 #include <regex.h>
+#include <stdlib.h>
 #include <gdk/gdkx.h>
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
 
-#include <gnome.h>
-
 #include "gsearchtool.h"
 #include "gsearchtool-callbacks.h"
 #include "gsearchtool-support.h"
diff --git a/gsearchtool/gsearchtool.c b/gsearchtool/gsearchtool.c
index bd37be2..fdbadcd 100644
--- a/gsearchtool/gsearchtool.c
+++ b/gsearchtool/gsearchtool.c
@@ -37,17 +37,18 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
+#include <errno.h>
+#include <stdlib.h>
 #include <sys/wait.h>
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gio/gio.h>
 
-#include <gnome.h>
-
 #include "gsearchtool.h"
 #include "gsearchtool-callbacks.h"
 #include "gsearchtool-support.h"
 #include "gsearchtool-spinner.h"
+#include "gsearchtool-entry.h"
 
 #define GNOME_SEARCH_TOOL_DEFAULT_ICON_SIZE 16
 #define GNOME_SEARCH_TOOL_STOCK "panel-searchtool"
@@ -570,7 +571,8 @@ build_search_command (GSearchWindow * gsearch,
 	start_animation (gsearch, first_pass);
 	setup_case_insensitive_arguments (gsearch);
 
-	file_is_named_utf8 = g_strdup ((gchar *) gtk_entry_get_text (GTK_ENTRY (gnome_entry_gtk_entry (GNOME_ENTRY (gsearch->name_contains_entry)))));
+	file_is_named_utf8 = g_strdup ((gchar *) gtk_entry_get_text (GTK_ENTRY (gsearch_history_entry_get_entry
+	                                         (GSEARCH_HISTORY_ENTRY (gsearch->name_contains_entry)))));
 
 	if (!file_is_named_utf8 || !*file_is_named_utf8) {
 		g_free (file_is_named_utf8);
@@ -587,7 +589,7 @@ build_search_command (GSearchWindow * gsearch,
 			g_error_free (error);
 			return NULL;
 		}
-		gnome_entry_prepend_history (GNOME_ENTRY (gsearch->name_contains_entry), TRUE, file_is_named_utf8);
+		gsearch_history_entry_prepend_text (GSEARCH_HISTORY_ENTRY (gsearch->name_contains_entry), file_is_named_utf8);
 
 		if ((strstr (locale, "*") == NULL) && (strstr (locale, "?") == NULL)) {
 			gchar *tmp;
@@ -1310,7 +1312,7 @@ handle_goption_args (GSearchWindow * gsearch)
 
 	if (GSearchGOptionArguments.name != NULL) {
 		goption_args_found = TRUE;
-		gtk_entry_set_text (GTK_ENTRY (gnome_entry_gtk_entry (GNOME_ENTRY (gsearch->name_contains_entry))),
+		gtk_entry_set_text (GTK_ENTRY (gsearch_history_entry_get_entry (GSEARCH_HISTORY_ENTRY (gsearch->name_contains_entry))),
 				    g_locale_to_utf8 (GSearchGOptionArguments.name, -1, NULL, NULL, NULL));
 	}
 	if (GSearchGOptionArguments.path != NULL) {
@@ -2513,7 +2515,7 @@ set_clone_command (GSearchWindow * gsearch,
 
 	argv[i++] = (gchar *) client_data;
 
-	file_is_named_utf8 = (gchar *) gtk_entry_get_text (GTK_ENTRY (gnome_entry_gtk_entry (GNOME_ENTRY (gsearch->name_contains_entry))));
+	file_is_named_utf8 = (gchar *) gtk_entry_get_text (GTK_ENTRY (gsearch_history_entry_get_entry (GSEARCH_HISTORY_ENTRY (gsearch->name_contains_entry))));
 	file_is_named_locale = g_locale_from_utf8 (file_is_named_utf8 != NULL ? file_is_named_utf8 : "" ,
 	                                           -1, NULL, NULL, NULL);
 	if (escape_values)
@@ -2759,18 +2761,18 @@ gsearch_app_create (GSearchWindow * gsearch)
 
 	gtk_table_attach (GTK_TABLE (gsearch->name_and_folder_table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 1);
 
-	gsearch->name_contains_entry = gnome_entry_new ("gsearchtool-file-entry");
+	gsearch->name_contains_entry = gsearch_history_entry_new ("gsearchtool-file-entry", FALSE);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), gsearch->name_contains_entry);
-	gnome_entry_set_max_saved (GNOME_ENTRY (gsearch->name_contains_entry), 10);
+	gsearch_history_entry_set_history_length (GSEARCH_HISTORY_ENTRY (gsearch->name_contains_entry), 10);
 	gtk_table_attach (GTK_TABLE (gsearch->name_and_folder_table), gsearch->name_contains_entry, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0, 0, 0);
-	entry =  gnome_entry_gtk_entry (GNOME_ENTRY (gsearch->name_contains_entry));
+	entry =  gsearch_history_entry_get_entry (GSEARCH_HISTORY_ENTRY (gsearch->name_contains_entry));
 
 	if (GTK_IS_ACCESSIBLE (gtk_widget_get_accessible (gsearch->name_contains_entry))) {
 		gsearch->is_window_accessible = TRUE;
 		add_atk_namedesc (gsearch->name_contains_entry, NULL, _("Enter a filename or partial filename with or without wildcards."));
 		add_atk_namedesc (entry, _("Name contains"), _("Enter a filename or partial filename with or without wildcards."));
 	}
-	g_signal_connect (G_OBJECT (gsearch->name_contains_entry), "activate",
+	g_signal_connect (G_OBJECT (gsearch_history_entry_get_entry (GSEARCH_HISTORY_ENTRY (gsearch->name_contains_entry))), "activate",
 			  G_CALLBACK (name_contains_activate_cb),
 			  (gpointer) gsearch);
 
@@ -2884,7 +2886,7 @@ gsearch_app_create (GSearchWindow * gsearch)
 	gtk_widget_hide (gsearch->stop_button);
 
 	gtk_window_set_focus (GTK_WINDOW (gsearch->window),
-		GTK_WIDGET (gnome_entry_gtk_entry (GNOME_ENTRY (gsearch->name_contains_entry))));
+		GTK_WIDGET (gsearch_history_entry_get_entry (GSEARCH_HISTORY_ENTRY (gsearch->name_contains_entry))));
 
 	gtk_window_set_default (GTK_WINDOW (gsearch->window), gsearch->find_button);
 
@@ -2959,9 +2961,8 @@ main (int argc,
 {
 	GSearchWindow * gsearch;
 	GOptionContext * context;
-	GnomeProgram * program;
-	GnomeClient * client;
-	GtkWidget * window;
+	GtkWidget * window;	
+	EggSMClient * client;
 
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -2972,16 +2973,10 @@ main (int argc,
 	gsearch_setup_goption_descriptions ();
 	g_option_context_add_main_entries (context, GSearchGOptionEntries, GETTEXT_PACKAGE);
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
+	g_option_context_add_group (context, egg_sm_client_get_option_group ());
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
 
-	program = gnome_program_init ("gnome-search-tool",
-	                              VERSION,
-	                              LIBGNOMEUI_MODULE,
-	                              argc, argv,
-	                              GNOME_PARAM_APP_DATADIR, DATADIR,
-	                              NULL);
-
 	g_set_application_name (_("Search for Files"));
 	gtk_window_set_default_icon_name (GNOME_SEARCH_TOOL_ICON);
 
@@ -3003,12 +2998,12 @@ main (int argc,
 	                            G_CALLBACK (window_state_event_cb),
 	                            (gpointer) gsearch);
 
-	if ((client = gnome_master_client ()) != NULL) {
-		g_signal_connect (client, "save_yourself",
+	if ((client = egg_sm_client_get ()) != NULL) {
+		g_signal_connect (client, "save_state",
 		                  G_CALLBACK (save_session_cb),
 		                  (gpointer) gsearch);
-		g_signal_connect (client, "die",
-		                  G_CALLBACK (die_cb),
+		g_signal_connect (client, "quit",
+		                  G_CALLBACK (quit_session_cb),
 		                  (gpointer) gsearch);
 	}
 
diff --git a/gsearchtool/gsearchtool.h b/gsearchtool/gsearchtool.h
index 4dff5a5..ecd6781 100644
--- a/gsearchtool/gsearchtool.h
+++ b/gsearchtool/gsearchtool.h
@@ -33,6 +33,7 @@ extern "C" {
 #pragma }
 #endif
 
+#include <gtk/gtk.h>
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]