[Goodies-commits] r2365 - in xfce4-weather-plugin/trunk: . icons icons/48x48 icons/liquid panel-plugin

Nick Schermer nick at xfce.org
Mon Jan 15 19:49:51 CET 2007


Author: nick
Date: 2007-01-15 18:49:51 +0000 (Mon, 15 Jan 2007)
New Revision: 2365

Modified:
   xfce4-weather-plugin/trunk/AUTHORS
   xfce4-weather-plugin/trunk/ChangeLog
   xfce4-weather-plugin/trunk/Makefile.am
   xfce4-weather-plugin/trunk/autogen.sh
   xfce4-weather-plugin/trunk/configure.in.in
   xfce4-weather-plugin/trunk/icons/48x48/Makefile.am
   xfce4-weather-plugin/trunk/icons/Makefile.am
   xfce4-weather-plugin/trunk/icons/liquid/Makefile.am
   xfce4-weather-plugin/trunk/panel-plugin/Makefile.am
   xfce4-weather-plugin/trunk/panel-plugin/weather-search.c
Log:
Improve the Makefile.am and configure.in.in files.
You can now use enter and double-click in the search dialog.


Modified: xfce4-weather-plugin/trunk/AUTHORS
===================================================================
--- xfce4-weather-plugin/trunk/AUTHORS	2007-01-15 17:57:27 UTC (rev 2364)
+++ xfce4-weather-plugin/trunk/AUTHORS	2007-01-15 18:49:51 UTC (rev 2365)
@@ -0,0 +1,4 @@
+Benedikt Meurer <benny at xfce.org>
+Jasper Huijsmans <jasper at xfce.org>
+Masse Nicolas <masse_nicolas at yahoo.fr>
+Nick Schermer <nick at xfce.org>
\ No newline at end of file

Modified: xfce4-weather-plugin/trunk/ChangeLog
===================================================================
--- xfce4-weather-plugin/trunk/ChangeLog	2007-01-15 17:57:27 UTC (rev 2364)
+++ xfce4-weather-plugin/trunk/ChangeLog	2007-01-15 18:49:51 UTC (rev 2365)
@@ -1,52 +1,59 @@
-2006-12-20 17:48 nick
+2007-01-15	Nick Schermer <nick at xfce.org>
+
+	* Improve the Makefile.am and configure.in.in files.
+	* You can now use enter and double-click in the search dialog.
+
+2006-12-20	Nick Schermer <nick at xfce.org>
+
 	* Add help button that uses exo-open.
 	* Merge new string
 
-2006-12-17 16:11 nick
+2006-12-17	Nick Schermer <nick at xfce.org>
+
 	* Cleaned up the code
 	* Applied patch from Peggy Kutyla (Bug 2656)
 
-2006-09-06 11:00 nick
+2006-09-06 	Nick Schermer <nick at xfce.org>
 
 	* Addded $Id$'s using svn:keyword
 	* Trailing spaces are striped by Geany
 
-2006-09-05 22:00 nick
+2006-09-05	Nick Schermer <nick at xfce.org>
 
 	* Fix typo in desktop file
 
-2006-09-05 19:16 nick
+2006-09-05	Nick Schermer <nick at xfce.org>
 
 	* Improve Makefile.am files. Make distcheck works
 	  without any problems now.
 
-2006-09-05 18:27 nick
+2006-09-05	Nick Schermer <nick at xfce.org>
 
 	* Bump version to 0.5.99.1
 	* Depend on Xfce4-panel 4.3.99.1
 
-2006-09-02 23:26 nick
+2006-09-02	Nick Schermer <nick at xfce.org>
 
 	* Include libxfcegui4_libs and some other fixes in the build files
 
-2006-09-02 21:42 nick
+2006-09-02	Nick Schermer <nick at xfce.org>
 
 	* Remove executables
 	* Update ChangeLog
 
-2006-08-08 23:14 nick
+2006-08-08	Nick Schermer <nick at xfce.org>
 
 	* Fix some memory leaks
 	* Clear dialog data and free the liststore
 	* Finalize scrollbox widget
 	* Use panel_slice_new0 and panel_slice_free
 
-2006-08-08 01:30 nick
+2006-08-08	Nick Schermer <nick at xfce.org>
 
 	* Changed version: 0.5.90.2
 	* Released 0.5.90.2
 
-2006-07-14 10:00 nick
+2006-07-14	Nick Schermer <nick at xfce.org>
 
 	* Fixed problems with --as-needed
 	* Some small mem leaks
@@ -56,31 +63,31 @@
 	* Added debug code
 	* Some cleanups
 
-2006-06-11 20:17 nick
+2006-06-11	Nick Schermer <nick at xfce.org>
 
 	* Reorder the includes a bit
 	* Changed titled dialog
 	* Added icon for the panel add items dialog
 
-2006-05-27 18:44 daichi
+2006-05-27	Nick Schermer <nick at xfce.org>
 
 	* *.po: Updated.
 	* *.gmo: Removed.
 
-2006-05-22 21:13 nick
+2006-05-22	Nick Schermer <nick at xfce.org>
 
 	* Make array const
 	* Added G_{BEGIN,END}_DECLS
 	* Improve Layout
 	* Use guint where possible
 
-2006-05-19 14:42 nick
+2006-05-19	Nick Schermer <nick at xfce.org>
 
 	* A lot if changed in the code to reduce exec. size
 	* Fix build
 	* Added new xfce dialog (if available)
 
-2006-05-18 23:44 nick
+2006-05-18	Nick Schermer <nick at xfce.org>
 
 	* Add refresh button to right click menu for the n00bs
 	* Cleanup code layout
@@ -89,45 +96,45 @@
 	* Remove the build and intltool files, they don't belong
 	  in a repo IMHO
 
-2006-05-18 00:10 nick
+2006-05-18	Nick Schermer <nick at xfce.org>
 
 	* Fix build errors
 	* Free a pixbuf with g_object_unref, not with g_free
 	* Typo in metric/imperial save
 
-2006-05-04 00:37 benny
+2006-05-04	Benedikt Meurer <benny at xfce.org>
 
 	* Apply patch from Oliver Lehmann to fix GCC 2.95 compilation.
 	  Bug #1759
 
-2006-04-25 22:52 bountykiller
+2006-04-25	Masse Nicolas <masse_nicolas at yahoo.fr>
 
 	* update with version from Jasper - now compatible with Xfce-4.4
 
-2003-07-11 15:56 huysmans      
+2003-07-11	Jasper Huijsmans <jasper at xfce.org>
        
 	* panel-plugin/sample.c: Hmm, chinese translation updates that      
 	  didn't get picked up by my previous commit. Should have been in      
 	  rc1, sorry.      
        
-2003-07-11 09:33 huysmans      
+2003-07-11	Jasper Huijsmans <jasper at xfce.org>
        
 	* ChangeLog: Update ChangeLog's for release      
        
-2003-07-10 11:56 huysmans      
+2003-07-10	Jasper Huijsmans <jasper at xfce.org>
        
 	* ChangeLog: Update ChangeLog's for release      
        
-2003-07-06 22:14 huysmans      
+2003-07-06	Jasper Huijsmans <jasper at xfce.org>
        
 	* ChangeLog: Update ChangeLogs      
        
-2003-07-06 15:35 xfce      
+2003-07-06	Jasper Huijsmans <jasper at xfce.org>
        
 	* Makefile.in, aclocal.m4, config.h.in, configure, ltconfig,      
 	  ltmain.sh, panel-plugin/Makefile.in: libtool update      
        
-2003-07-02 12:18 bmeurer      
+2003-07-02	Benedikt Meurer <benny at xfce.org>
        
 	* AUTHORS, COPYING, INSTALL, autogen.sh, config.guess, config.sub,      
 	  ltconfig, ltcf-c.sh, ltmain.sh, Makefile.in, aclocal.m4, compile,      
@@ -137,7 +144,7 @@
 	  panel-plugin/Makefile.in, panel-plugin/sample.c: Initial import of      
 	  the sample panel plugin.      
        
-2003-07-02 12:18 bmeurer      
+2003-07-02	Benedikt Meurer <benny at xfce.org>
        
 	* AUTHORS, COPYING, INSTALL, autogen.sh, config.guess, config.sub,      
 	  ltconfig, ltcf-c.sh, ltmain.sh, Makefile.in, aclocal.m4, compile,      

Modified: xfce4-weather-plugin/trunk/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/Makefile.am	2007-01-15 17:57:27 UTC (rev 2364)
+++ xfce4-weather-plugin/trunk/Makefile.am	2007-01-15 18:49:51 UTC (rev 2365)
@@ -4,10 +4,6 @@
 	panel-plugin							\
 	po								\
 	icons
-
-AUTOMAKE_OPTIONS =							\
-	1.8								\
-	dist-bzip2
 	
 distclean-local:
 	rm -rf *.cache *~
@@ -25,3 +21,5 @@
 	intltool-extract						\
 	intltool-merge							\
 	intltool-update
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

Modified: xfce4-weather-plugin/trunk/autogen.sh
===================================================================
--- xfce4-weather-plugin/trunk/autogen.sh	2007-01-15 17:57:27 UTC (rev 2364)
+++ xfce4-weather-plugin/trunk/autogen.sh	2007-01-15 18:49:51 UTC (rev 2365)
@@ -29,7 +29,7 @@
 
 # substitute revision and linguas
 linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%04d\n", $2}'`
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
     < "configure.in.in" > "configure.in"

Modified: xfce4-weather-plugin/trunk/configure.in.in
===================================================================
--- xfce4-weather-plugin/trunk/configure.in.in	2007-01-15 17:57:27 UTC (rev 2364)
+++ xfce4-weather-plugin/trunk/configure.in.in	2007-01-15 18:49:51 UTC (rev 2365)
@@ -2,49 +2,70 @@
 dnl
 dnl xfce4-weather-plugin - Show current weather conditions in your panel
 dnl
-dnl 2003 Benedikt Meurer <benny at xfce.org>
-dnl 2006 Nick Schermer <nick at xfce.org>
+dnl 2003      Benedikt Meurer <benny at xfce.org>
+dnl 2006-2007 Nick Schermer <nick at xfce.org>
 dnl
 
-dnl version info
-m4_define([weather_version], [0.5.99.1])
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
+m4_define([weather_version_major], [0])
+m4_define([weather_version_minor], [5])
+m4_define([weather_version_micro], [99])
+m4_define([weather_version_build], [r at REVISION@])
+m4_define([weather_version_tag], [svn])
+m4_define([weather_version], [weather_version_major().weather_version_minor().weather_version_micro()ifelse(weather_version_tag(), [svn], [weather_version_tag()-weather_version_build()], [weather_version_tag()])])
 
-dnl init autoconf
-AC_INIT([xfce4-weather-plugin], [weather_version], [goodies-dev at xfce.org])
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (c) 2006-2007
+        The Xfce development team. All rights reserved.])
+AC_INIT([xfce4-weather-plugin], [weather_version()], [http://bugzilla.xfce.org/], [xfce4-weather-plugin])
 AC_PREREQ([2.50])
+AC_REVISION([$Id$])
 
-dnl init automake
-WEATHER_VERSION=weather_version
-AM_INIT_AUTOMAKE([xfce4-weather-plugin], [$WEATHER_VERSION])
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE()
 
-dnl check for basic programs
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
+AC_PROG_LD()
+AC_PROG_INSTALL()
 AC_PROG_INTLTOOL()
 
-dnl check for standard header files
-AC_HEADER_STDC
+dnl **********************************
+dnl *** Check for standard headers ***
+dnl **********************************
+AC_HEADER_STDC()
 AC_CHECK_HEADERS([string.h fcntl.h errno.h sys/socket.h netdb.h \
                   netinet/in.h sys/types.h time.h unistd.h stdio.h \
 		  sys/stat.h stddef.h])
 
-dnl required
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
+XDT_I18N([@LINGUAS@])
+
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
-
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1])
-
 XDT_CHECK_PACKAGE([LIBXML], [libxml-2.0], [2.4.0])
 
-dnl Check for i18n support
-XDT_I18N([@LINGUAS@])
-
-dnl check for debugging support
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
 XDT_FEATURE_DEBUG()
 
 AC_OUTPUT([

Modified: xfce4-weather-plugin/trunk/icons/48x48/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/icons/48x48/Makefile.am	2007-01-15 17:57:27 UTC (rev 2364)
+++ xfce4-weather-plugin/trunk/icons/48x48/Makefile.am	2007-01-15 18:49:51 UTC (rev 2365)
@@ -1,7 +1,11 @@
+# $Id$
+
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 
-icons_DATA =				\
+icons_DATA =								\
 	xfce4-weather.png
 
-EXTRA_DIST =				\
+EXTRA_DIST =								\
 	$(icons_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:


Property changes on: xfce4-weather-plugin/trunk/icons/48x48/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-weather-plugin/trunk/icons/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/icons/Makefile.am	2007-01-15 17:57:27 UTC (rev 2364)
+++ xfce4-weather-plugin/trunk/icons/Makefile.am	2007-01-15 18:49:51 UTC (rev 2365)
@@ -1,3 +1,5 @@
+# $Id$
+
 SUBDIRS =								\
 	liquid								\
 	48x48
@@ -14,3 +16,5 @@
                 echo "***   $(gtk_update_icon_cache)";			\
 		echo "***";						\
         fi
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:


Property changes on: xfce4-weather-plugin/trunk/icons/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-weather-plugin/trunk/icons/liquid/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/icons/liquid/Makefile.am	2007-01-15 17:57:27 UTC (rev 2364)
+++ xfce4-weather-plugin/trunk/icons/liquid/Makefile.am	2007-01-15 18:49:51 UTC (rev 2365)
@@ -1,54 +1,58 @@
+# $Id$
+
 liquiddir = $(datadir)/xfce4/weather/icons/liquid
 
-liquid_DATA =	0.png	\
-		1.png	\
-		2.png	\
-		3.png	\
-		4.png	\
-		5.png	\
-		6.png	\
-		7.png	\
-		8.png	\
-		9.png	\
-		10.png	\
-		11.png	\
-		12.png	\
-		13.png	\
-		14.png	\
-		15.png	\
-		16.png	\
-		17.png	\
-		18.png	\
-		19.png	\
-		20.png	\
-		21.png	\
-		22.png	\
-		23.png	\
-		24.png	\
-		25.png	\
-		26.png	\
-		27.png	\
-		28.png	\
-		29.png	\
-		30.png	\
-		31.png	\
-		32.png	\
-		33.png	\
-		34.png	\
-		35.png	\
-		36.png	\
-		37.png	\
-		38.png	\
-		39.png	\
-		40.png	\
-		41.png	\
-		42.png	\
-		43.png	\
-		44.png	\
-		45.png	\
-		46.png	\
-		47.png	\
+liquid_DATA =	0.png							\
+		1.png							\
+		2.png							\
+		3.png							\
+		4.png							\
+		5.png							\
+		6.png							\
+		7.png							\
+		8.png							\
+		9.png							\
+		10.png							\
+		11.png							\
+		12.png							\
+		13.png							\
+		14.png							\
+		15.png							\
+		16.png							\
+		17.png							\
+		18.png							\
+		19.png							\
+		20.png							\
+		21.png							\
+		22.png							\
+		23.png							\
+		24.png							\
+		25.png							\
+		26.png							\
+		27.png							\
+		28.png							\
+		29.png							\
+		30.png							\
+		31.png							\
+		32.png							\
+		33.png							\
+		34.png							\
+		35.png							\
+		36.png							\
+		37.png							\
+		38.png							\
+		39.png							\
+		40.png							\
+		41.png							\
+		42.png							\
+		43.png							\
+		44.png							\
+		45.png							\
+		46.png							\
+		47.png							\
 		99.png
 
-EXTRA_DIST =		\
+EXTRA_DIST =								\
 	$(liquid_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:


Property changes on: xfce4-weather-plugin/trunk/icons/liquid/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-weather-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/Makefile.am	2007-01-15 17:57:27 UTC (rev 2364)
+++ xfce4-weather-plugin/trunk/panel-plugin/Makefile.am	2007-01-15 18:49:51 UTC (rev 2365)
@@ -1,8 +1,16 @@
 # $Id$
 
+INCLUDES =								\
+        -I$(top_srcdir)                                         	\
+	-DTHEMESDIR=\"$(datadir)/xfce4/weather/icons\" 			\
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
+	-DG_LOG_DOMAIN=\"weather\"
+
 plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfce4-weather-plugin
 
+plugin_PROGRAMS =							\
+	xfce4-weather-plugin
+
 xfce4_weather_plugin_SOURCES =						\
 	weather.c							\
 	weather.h							\
@@ -26,9 +34,6 @@
 	weather-translate.h
 
 xfce4_weather_plugin_CFLAGS =						\
-        -I$(top_srcdir)                                         	\
-	-DTHEMESDIR=\"$(datadir)/xfce4/weather/icons\" 			\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	$(LIBXFCE4PANEL_CFLAGS)						\
 	$(LIBXFCEGUI4_CFLAGS)						\
         $(LIBXFCE4UTIL_CFLAGS)                                   	\
@@ -56,3 +61,5 @@
 CLEANFILES =								\
 	$(desktop_in_files)						\
 	$(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-search.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-search.c	2007-01-15 17:57:27 UTC (rev 2364)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-search.c	2007-01-15 18:49:51 UTC (rev 2365)
@@ -18,7 +18,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "weather-search.h"
 
 #include <string.h>
 
@@ -26,6 +25,7 @@
 #include "weather-data.h"
 #include "weather.h"
 
+#include "weather-search.h"
 #include "weather-http.h"
 
 #define BORDER 8
@@ -128,7 +128,7 @@
 
 
 static gboolean
-search_cb (GtkButton *button,
+search_cb (GtkWidget *widget,
            gpointer   user_data)
 {
   search_dialog *dialog = (search_dialog *) user_data;
@@ -160,6 +160,17 @@
 
 
 
+static void
+pass_search_results (GtkTreeView       *tree_view,
+                     GtkTreePath       *path,
+                     GtkTreeViewColumn *column,
+                     GtkDialog         *dialog)
+{
+  gtk_dialog_response (dialog, GTK_RESPONSE_ACCEPT);
+}
+
+
+
 search_dialog *
 create_search_dialog (GtkWindow *parent,
                       gchar     *proxy_host,
@@ -185,47 +196,47 @@
                                  GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL,
                                  GTK_RESPONSE_REJECT, NULL);
 
-  vbox = gtk_vbox_new (FALSE, BORDER);
   gtk_window_set_icon_name (GTK_WINDOW (dialog->dialog), GTK_STOCK_FIND);
 
+  vbox = gtk_vbox_new (FALSE, BORDER);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox), vbox,
+                      TRUE, TRUE, 0);
+
   label = gtk_label_new (_("Enter a city name or zip code:"));
   gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-  dialog->search_entry = gtk_entry_new ();
-  button = gtk_button_new_from_stock (GTK_STOCK_FIND);
   hbox = gtk_hbox_new (FALSE, BORDER);
-  gtk_box_pack_start (GTK_BOX (hbox), dialog->search_entry, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
-  /* list */
-  dialog->result_mdl = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-  dialog->result_list =
-    gtk_tree_view_new_with_model (GTK_TREE_MODEL (dialog->result_mdl));
+  dialog->search_entry = gtk_entry_new ();
+  gtk_box_pack_start (GTK_BOX (hbox), dialog->search_entry, TRUE, TRUE, 0);
+  g_signal_connect (G_OBJECT (dialog->search_entry), "activate",
+                    G_CALLBACK (search_cb), dialog);
 
-  column = gtk_tree_view_column_new_with_attributes (_("Results"), renderer,
-                                                     "text", 0, NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->result_list), column);
+  button = gtk_button_new_from_stock (GTK_STOCK_FIND);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+  g_signal_connect (G_OBJECT (button), "clicked",
+                    G_CALLBACK (search_cb), dialog);
 
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  
   scroll = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scroll), dialog->result_list);
-
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
   gtk_container_add (GTK_CONTAINER (frame), scroll);
 
-  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox), vbox, TRUE,
-                      TRUE, 0);
+  dialog->result_mdl = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+  dialog->result_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (dialog->result_mdl));
+  column = gtk_tree_view_column_new_with_attributes (_("Results"), renderer, "text", 0, NULL);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->result_list), column);
+  g_signal_connect (G_OBJECT (dialog->result_list), "row-activated",
+                    G_CALLBACK (pass_search_results), dialog->dialog);
+  gtk_container_add (GTK_CONTAINER (scroll), dialog->result_list);
 
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
-
-  g_signal_connect (G_OBJECT (button), "clicked",
-                    G_CALLBACK (search_cb), dialog);
-
   gtk_widget_set_size_request (dialog->dialog, 350, 250);
 
   return dialog;
@@ -253,6 +264,7 @@
           dialog->result = g_strdup (g_value_get_string (&value));
 
           g_value_unset (&value);
+          
           return TRUE;
         }
     }




More information about the Goodies-commits mailing list