Enlightenment CVS committal
Author : moom16
Project : e17
Module : apps/eclair
Dir : e17/apps/eclair/src
Modified Files:
Makefile.am eclair_dialogs.c
Log Message:
* Init and use gtk more properly
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 21 May 2005 10:18:11 -0000 1.5
+++ Makefile.am 28 May 2005 09:04:14 -0000 1.6
@@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
INCLUDES = \
[EMAIL PROTECTED]@ \
@gtk_cflags@ \
@libglade_cflags@ \
@evas_cflags@ \
@@ -13,8 +14,7 @@
AM_CFLAGS = \
-Wall \
--O1 \
--g
+-O1
bin_PROGRAMS = eclair
@@ -34,6 +34,7 @@
eclair_dialogs.c eclair_dialogs.h
eclair_LDADD = \
[EMAIL PROTECTED]@ \
@gtk_libs@ \
@libglade_libs@ \
@evas_libs@ \
@@ -42,5 +43,4 @@
@emotion_libs@ \
@esmart_libs@ -lesmart_draggies \
@taglib_libs@ -ltag_c \
[EMAIL PROTECTED]@ \
--lpthread
[EMAIL PROTECTED]@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_dialogs.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- eclair_dialogs.c 27 May 2005 21:31:49 -0000 1.7
+++ eclair_dialogs.c 28 May 2005 09:04:14 -0000 1.8
@@ -1,4 +1,5 @@
#include "eclair_dialogs.h"
+#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "../config.h"
@@ -9,7 +10,7 @@
#include "eclair_utils.h"
static void *_eclair_dialogs_thread(void *param);
-static gint _eclair_dialogs_update(gpointer data);
+static gboolean _eclair_dialogs_update(gpointer data);
static void _eclair_dialogs_file_chooser_open(Eclair_Dialogs_Manager
*dialogs_manager, Eclair_Dialog_File_Chooser_Type file_chooser_type);
static gboolean _eclair_dialogs_file_chooser_on_add_files(GtkWidget *widget,
gpointer data);
@@ -32,6 +33,9 @@
if (!dialogs_manager || !eclair)
return;
+ g_thread_init(NULL);
+ gtk_init(eclair->argc, eclair->argv);
+
dialogs_manager->eclair = eclair;
dialogs_manager->file_chooser_xml = NULL;
@@ -110,7 +114,7 @@
}
//Called each 50ms and check if we must do something (popup menu, open file
selection dialog...)
-static gint _eclair_dialogs_update(gpointer data)
+static gboolean _eclair_dialogs_update(gpointer data)
{
Eclair_Dialogs_Manager *dialogs_manager;
@@ -134,7 +138,7 @@
dialogs_manager->should_open_file_chooser = ECLAIR_FC_NONE;
}
- return 1;
+ return TRUE;
}
//Init and start the eclair dialogs main loop
@@ -146,8 +150,6 @@
if (!(eclair = param))
return NULL;
- gtk_init(eclair->argc, eclair->argv);
-
dialogs_manager = &eclair->dialogs_manager;
//Create the menu
@@ -163,7 +165,7 @@
glade_xml_signal_connect_data(dialogs_manager->menu_xml,
"remove_unselected_handler",
G_CALLBACK(_eclair_dialogs_menu_on_remove_unselected), eclair);
glade_xml_signal_connect_data(dialogs_manager->menu_xml,
"remove_all_handler", G_CALLBACK(_eclair_dialogs_menu_on_remove_all), eclair);
- g_timeout_add(50, _eclair_dialogs_update, dialogs_manager);
+ g_idle_add(_eclair_dialogs_update, dialogs_manager);
gtk_main();
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
