projects
/
tilda-gobject.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove old main() functions
[tilda-gobject.git]
/
tilda.c
diff --git
a/tilda.c
b/tilda.c
index
d6d60af
..
e13ca49
100644
(file)
--- a/
tilda.c
+++ b/
tilda.c
@@
-10,7
+10,9
@@
GPtrArray *windows;
static void
tilda_initialize_dbus ()
{
static void
tilda_initialize_dbus ()
{
- const gchar service_name[] = "net.sourceforge.Tilda";
+ debug_enter ();
+
+ static const gchar service_name[] = "net.sourceforge.Tilda";
GError *error = NULL;
DBusGProxy *driver_proxy;
int request_ret;
GError *error = NULL;
DBusGProxy *driver_proxy;
int request_ret;
@@
-45,6
+47,8
@@
tilda_initialize_dbus ()
static gint
tilda_find_next_free_window_number ()
{
static gint
tilda_find_next_free_window_number ()
{
+ debug_enter ();
+
gint i, j;
gboolean found;
gint i, j;
gboolean found;
@@
-73,6
+77,8
@@
tilda_find_next_free_window_number ()
static TildaWindow *
tilda_add_window ()
{
static TildaWindow *
tilda_add_window ()
{
+ debug_enter ();
+
TildaWindow *ret;
gint number;
TildaWindow *ret;
gint number;
@@
-81,13
+87,15
@@
tilda_add_window ()
g_ptr_array_add (windows, ret);
g_ptr_array_add (windows, ret);
-
g_print ("Adding window: 0x%x (number %d of %d)\n", ret, ret->number, windows->len
);
+
debug_printf ("Adding window: 0x%x (number %d of %d)\n", ret, ret->number, windows->len-1
);
return ret;
}
static void
tilda_del_window (gint number)
{
return ret;
}
static void
tilda_del_window (gint number)
{
+ debug_enter ();
+
gint i;
TildaWindow *win;
gint i;
TildaWindow *win;
@@
-97,7
+105,7
@@
tilda_del_window (gint number)
if (win->number == number)
{
if (win->number == number)
{
-
g_print ("Deleting window 0x%x (number %d)\n", win, win->number
);
+
debug_printf ("Deleting window 0x%x (number %d of %d)\n", win, win->number, windows->len-1
);
g_ptr_array_remove_index (windows, i);
g_object_unref (G_OBJECT(win));
break;
g_ptr_array_remove_index (windows, i);
g_object_unref (G_OBJECT(win));
break;
@@
-107,11
+115,16
@@
tilda_del_window (gint number)
int main (int argc, char *argv[])
{
int main (int argc, char *argv[])
{
+ debug_enter ();
+
TildaWindow *tw;
/* Initialize GTK+ (and the GObject system) */
gtk_init (&argc, &argv);
TildaWindow *tw;
/* Initialize GTK+ (and the GObject system) */
gtk_init (&argc, &argv);
+ /* Initialize the keybinder */
+ tomboy_keybinder_init ();
+
/* Start our connection to DBus */
tilda_initialize_dbus ();
/* Start our connection to DBus */
tilda_initialize_dbus ();
@@
-124,14
+137,10
@@
int main (int argc, char *argv[])
* a good start for testing and integration of more of TildaWindow
* and TildaTerminal. */
tw = tilda_add_window ();
* a good start for testing and integration of more of TildaWindow
* and TildaTerminal. */
tw = tilda_add_window ();
- tw = tilda_add_window ();
- tw = tilda_add_window ();
-
- tilda_del_window (1);
-
- tw = tilda_add_window ();
+ debug_printf ("Starting gtk_main()!\n");
gtk_main ();
gtk_main ();
+ debug_printf ("Out of gtk_main(), going down\n");
return 0;
}
return 0;
}