GNOME.org
 

[gnome-pilot-conduits] Remove obsolete mal-conduit. Start of cleanups for gtk deprecated symbols.

commit 1afecaeffceddf0e9e6af901b3eeb3c3f1f504f9
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Wed Sep 29 23:05:51 2010 +0100

    Remove obsolete mal-conduit.  Start of cleanups for gtk deprecated symbols.

 ChangeLog                                          |    6 +
 Makefile.am                                        |    1 -
 configure.in                                       |   15 +-
 email/email_conduit.c                              |   53 +-
 expense/expense_conduit.c                          |   30 +-
 mal-conduit/.cvsignore                             |   27 -
 mal-conduit/ABOUT-NLS                              |  292 ---
 mal-conduit/COPYING                                |  344 ----
 mal-conduit/ChangeLog                              |  149 --
 mal-conduit/Makefile.am                            |    8 -
 mal-conduit/acconfig.h                             |   18 -
 mal-conduit/mal/.cvsignore                         |    4 -
 mal-conduit/mal/Makefile.am                        |    3 -
 mal-conduit/mal/client/.cvsignore                  |    4 -
 mal-conduit/mal/client/Makefile.am                 |    2 -
 mal-conduit/mal/client/common/.cvsignore           |    6 -
 mal-conduit/mal/client/common/AGClientProcessor.c  | 1268 -------------
 mal-conduit/mal/client/common/AGClientProcessor.h  |  228 ---
 mal-conduit/mal/client/common/AGCommandProcessor.c |  917 ---------
 mal-conduit/mal/client/common/AGCommandProcessor.h |  177 --
 mal-conduit/mal/client/common/AGLinkMBResource.h   |   31 -
 mal-conduit/mal/client/common/AGLinkMessageBox.c   |  274 ---
 mal-conduit/mal/client/common/AGLinkMessageBox.h   |   56 -
 .../mal/client/common/AGMobileLinkSettings.c       |  438 -----
 .../mal/client/common/AGMobileLinkSettings.h       |   82 -
 mal-conduit/mal/client/common/AGPasswordPrompt.c   |  163 --
 mal-conduit/mal/client/common/AGPasswordPrompt.h   |   53 -
 mal-conduit/mal/client/common/AGProxyDebug.c       |   89 -
 mal-conduit/mal/client/common/AGProxyDebug.h       |   30 -
 mal-conduit/mal/client/common/AGShlapi.c           |  101 -
 mal-conduit/mal/client/common/AGShlapi.h           |   40 -
 mal-conduit/mal/client/common/AGSyncCommon.c       |  318 ----
 mal-conduit/mal/client/common/AGSyncCommon.h       |   93 -
 mal-conduit/mal/client/common/AGSyncProcessor.c    |  870 ---------
 mal-conduit/mal/client/common/AGSyncProcessor.h    |  209 ---
 .../mal/client/common/AGTimeoutMessageBox.c        |  190 --
 .../mal/client/common/AGTimeoutMessageBox.h        |   47 -
 mal-conduit/mal/client/common/Makefile.am          |   35 -
 mal-conduit/mal/client/unix/.cvsignore             |    6 -
 mal-conduit/mal/client/unix/HISTORY                |   40 -
 mal-conduit/mal/client/unix/MAL31DBConfig.c        |   66 -
 mal-conduit/mal/client/unix/MAL31DBConfig.h        |   32 -
 mal-conduit/mal/client/unix/MAL31ServerConfig.c    |  187 --
 mal-conduit/mal/client/unix/MAL31ServerConfig.h    |   40 -
 mal-conduit/mal/client/unix/MAL31UserConfig.c      |  238 ---
 mal-conduit/mal/client/unix/MAL31UserConfig.h      |   30 -
 mal-conduit/mal/client/unix/Makefile.am            |   36 -
 mal-conduit/mal/client/unix/README_malsync         |  103 -
 mal-conduit/mal/client/unix/TODO                   |   14 -
 mal-conduit/mal/client/unix/ap_snprintf.c          | 1038 -----------
 mal-conduit/mal/client/unix/getopt.c               |  755 --------
 mal-conduit/mal/client/unix/getopt.h               |  128 --
 mal-conduit/mal/client/unix/malsync.c              | 1634 ----------------
 mal-conduit/mal/client/unix/malsync.h              |   57 -
 mal-conduit/mal/common/.cvsignore                  |    6 -
 mal-conduit/mal/common/AGArray.c                   |  333 ----
 mal-conduit/mal/common/AGArray.h                   |  178 --
 mal-conduit/mal/common/AGBase64.c                  |  210 ---
 mal-conduit/mal/common/AGBase64.h                  |   51 -
 mal-conduit/mal/common/AGBufferReader.c            |  121 --
 mal-conduit/mal/common/AGBufferReader.h            |   53 -
 mal-conduit/mal/common/AGBufferWriter.c            |  115 --
 mal-conduit/mal/common/AGBufferWriter.h            |   59 -
 mal-conduit/mal/common/AGBufferedNet.c             |  823 --------
 mal-conduit/mal/common/AGBufferedNet.h             |   45 -
 mal-conduit/mal/common/AGCEProtocol.c              |   58 -
 mal-conduit/mal/common/AGCEProtocol.h              |   46 -
 mal-conduit/mal/common/AGCollection.c              |   97 -
 mal-conduit/mal/common/AGCollection.h              |  163 --
 mal-conduit/mal/common/AGDBConfig.c                |  327 ----
 mal-conduit/mal/common/AGDBConfig.h                |   99 -
 mal-conduit/mal/common/AGDesktopInfoPalm.c         |  431 -----
 mal-conduit/mal/common/AGDesktopInfoPalm.h         |   75 -
 mal-conduit/mal/common/AGDesktopInfoWinCE.c        |   64 -
 mal-conduit/mal/common/AGDesktopInfoWinCE.h        |   54 -
 mal-conduit/mal/common/AGDeviceInfo.c              |  182 --
 mal-conduit/mal/common/AGDeviceInfo.h              |   76 -
 mal-conduit/mal/common/AGDigest.c                  |   63 -
 mal-conduit/mal/common/AGDigest.h                  |   39 -
 mal-conduit/mal/common/AGHashTable.c               |  606 ------
 mal-conduit/mal/common/AGHashTable.h               |  189 --
 mal-conduit/mal/common/AGLocationConfig.c          |  350 ----
 mal-conduit/mal/common/AGLocationConfig.h          |   99 -
 mal-conduit/mal/common/AGMD5.c                     |   38 -
 mal-conduit/mal/common/AGMD5.h                     |   37 -
 mal-conduit/mal/common/AGMsg.c                     |  124 --
 mal-conduit/mal/common/AGMsg.h                     |   66 -
 mal-conduit/mal/common/AGNet.c                     |  557 ------
 mal-conduit/mal/common/AGNet.h                     |  379 ----
 mal-conduit/mal/common/AGNetMac.c                  |  416 -----
 mal-conduit/mal/common/AGNetPilot.c                |  555 ------
 mal-conduit/mal/common/AGPalmProtocol.c            |   82 -
 mal-conduit/mal/common/AGPalmProtocol.h            |   79 -
 mal-conduit/mal/common/AGProtectedMem.c            |  258 ---
 mal-conduit/mal/common/AGProtectedMem.h            |  100 -
 mal-conduit/mal/common/AGProtocol.c                | 1092 -----------
 mal-conduit/mal/common/AGProtocol.h                |  421 -----
 mal-conduit/mal/common/AGProxy.c                   |  192 --
 mal-conduit/mal/common/AGProxy.h                   |   40 -
 mal-conduit/mal/common/AGProxySearch.cpp           |  621 -------
 mal-conduit/mal/common/AGProxySearch.h             |   39 -
 mal-conduit/mal/common/AGReader.c                  |  329 ----
 mal-conduit/mal/common/AGReader.h                  |  122 --
 mal-conduit/mal/common/AGRecord.c                  |  147 --
 mal-conduit/mal/common/AGRecord.h                  |   85 -
 mal-conduit/mal/common/AGResourceManager.h         |  362 ----
 mal-conduit/mal/common/AGResourceManagerPalm.c     |  681 -------
 mal-conduit/mal/common/AGResourceManagerWin.c      | 1964 --------------------
 mal-conduit/mal/common/AGResourceManagerWinCE.c    |  799 --------
 mal-conduit/mal/common/AGServerConfig.c            |  741 --------
 mal-conduit/mal/common/AGServerConfig.h            |  139 --
 mal-conduit/mal/common/AGSynchronize.c             |  170 --
 mal-conduit/mal/common/AGSynchronize.h             |   67 -
 mal-conduit/mal/common/AGTypes.h                   |  136 --
 mal-conduit/mal/common/AGUserConfig.c              |  544 ------
 mal-conduit/mal/common/AGUserConfig.h              |   84 -
 mal-conduit/mal/common/AGUtil.h                    |   67 -
 mal-conduit/mal/common/AGUtilMac.c                 |   54 -
 mal-conduit/mal/common/AGUtilMac.h                 |   57 -
 mal-conduit/mal/common/AGUtilPalmOS.c              |  226 ---
 mal-conduit/mal/common/AGUtilPalmOS.h              |  132 --
 mal-conduit/mal/common/AGUtilUnix.c                |   49 -
 mal-conduit/mal/common/AGUtilUnix.h                |   65 -
 mal-conduit/mal/common/AGUtilWin.c                 |  442 -----
 mal-conduit/mal/common/AGUtilWin.h                 |  143 --
 mal-conduit/mal/common/AGWriter.c                  |  175 --
 mal-conduit/mal/common/AGWriter.h                  |  103 -
 mal-conduit/mal/common/MALCommonWin.h              |   15 -
 mal-conduit/mal/common/Makefile.am                 |   73 -
 mal-conduit/po/.cvsignore                          |    2 -
 mal-conduit/po/Makefile.in.in                      |  206 --
 mal-conduit/src/.cvsignore                         |    8 -
 mal-conduit/src/Makefile.am                        |   44 -
 mal-conduit/src/avantgo.png                        |  Bin 2113 -> 0 bytes
 mal-conduit/src/mal-conduit-capplet.c              |  317 ----
 mal-conduit/src/mal-conduit-control-applet.desktop |    9 -
 mal-conduit/src/mal-conduit.c                      |  412 ----
 mal-conduit/src/mal-conduit.h                      |   11 -
 mal-conduit/src/mal.conduit.in                     |    9 -
 memo/memo-conduit-control-applet.c                 |   24 +-
 memo/memo_conduit.c                                |   36 +-
 memo_file/memo_file_conduit.c                      |   56 +-
 time/time-conduit.c                                |   10 +-
 143 files changed, 118 insertions(+), 30180 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fa295e8..d857605 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
         * configure.in: Added 'ro' to ALL_LINGUAS.
 
+2010-09-29  Matt Davey  <mcdavey mrao cam ac uk>
+        * configure.in: bump version to 2.0.32
+	* .gitignore: added
+	* mal-conduit/: removed obsolete mal-conduit
+	* 
+
 2009-01-08  Matt Davey  <mcdavey mrao cam ac uk>
         * configure.in: bump version to 2.0.18
 
diff --git a/Makefile.am b/Makefile.am
index b592bcb..0d0b133 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS =		\
 	po		\
 	email		\
 	expense		\
-	mal-conduit	\
 	memo_file	\
 	time
 
diff --git a/configure.in b/configure.in
index fe434da..6522ec2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gnome-pilot-conduits,2.0.18)
+AM_INIT_AUTOMAKE(gnome-pilot-conduits,2.32.0)
 RELEASE=1
 AC_SUBST(RELEASE)
 
@@ -21,13 +21,15 @@ PKG_PROG_PKG_CONFIG
 dnl ******************************
 dnl Library Checks
 dnl ******************************
-LIBGNOME_REQUIRED="libgnome-2.0 >= 2.0.0"
-GNOME_PILOT_REQUIRED="gnome-pilot-2.0 >= 2.0.13"
+LIBGNOME_REQUIRED="libgnome-2.0 >= 2.0.0 libgnomeui-2.0"
+LIBGTK_REQUIRED="gtk+-2.0 >= 2.13.0"
+GNOME_PILOT_REQUIRED="gnome-pilot-2.0 >= 2.32.0"
 LIBXML_REQUIRED="libxml-2.0"
 
 PKG_CHECK_MODULES(GNOME_PILOT_CONDUITS,
 [
 	$LIBGNOME_REQUIRED
+	$LIBGTK_REQUIRED
 	$GNOME_PILOT_REQUIRED
 	$LIBXML_REQUIRED
 ])
@@ -65,13 +67,6 @@ email/Makefile
 expense/Makefile
 memo_file/Makefile
 time/Makefile
-mal-conduit/Makefile
-mal-conduit/src/Makefile
-mal-conduit/mal/Makefile
-mal-conduit/mal/common/Makefile
-mal-conduit/mal/client/Makefile
-mal-conduit/mal/client/common/Makefile
-mal-conduit/mal/client/unix/Makefile
 gnome-pilot-conduits.spec
 po/Makefile.in
 ])
diff --git a/email/email_conduit.c b/email/email_conduit.c
index a764476..b6426b2 100644
--- a/email/email_conduit.c
+++ b/email/email_conduit.c
@@ -6,6 +6,7 @@
 
 #include <glib.h>
 #include <gnome.h>
+#include <gtk/gtk.h>
 
 #include <pi-source.h>
 #include <pi-socket.h>
@@ -647,14 +648,18 @@ static gint synchronize( GnomePilotConduit *c, GnomePilotDBInfo *dbi )
 
 	if (f) {
 #ifdef PILOT_LINK_0_12
-	    fgets (pi_buf->data, pi_buf->allocated - 1, f);
-	    while (!feof (f) && strncmp (pi_buf->data, "From ", 5)) {
-		fgets (pi_buf->data, pi_buf->allocated - 1, f);
- 	    }
+	    if (fgets (pi_buf->data, pi_buf->allocated - 1, f) != NULL) {
+		while (!feof (f) && strncmp (pi_buf->data, "From ", 5)) {
+		    if (fgets (pi_buf->data, pi_buf->allocated - 1, f) == NULL)
+			break;
+		}
+	    }
 #else
-	    fgets (buffer, sizeof (buffer) - 1, f);
-	    while (!feof (f) && strncmp (buffer, "From ", 5)) {
-		fgets (buffer, sizeof (buffer) - 1, f);
+	    if (fgets (buffer, sizeof (buffer) - 1, f) != NULL) {
+		while (!feof (f) && strncmp (buffer, "From ", 5)) {
+		    if (fgets (buffer, sizeof (buffer) - 1, f) == NULL)
+			break;
+		}
 	    }
 #endif
 
@@ -756,13 +761,13 @@ createFileSelector (GtkWidget *widget, gpointer data)
 
     fs = gtk_file_selection_new(_("Select an mbox file or an MH directory"));
     gtk_object_set_data(GTK_OBJECT(fs), "entry", (gpointer) data);
-    gtk_signal_connect (GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button),
-		"clicked", GTK_SIGNAL_FUNC(handleFileSelector), fs);
+    g_signal_connect (GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button),
+		"clicked", G_CALLBACK(handleFileSelector), fs);
 
-    gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION(fs)->ok_button),
-		"clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), (gpointer) fs);
-    gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION(fs)->cancel_button),
-		"clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), (gpointer) fs);
+    g_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION(fs)->ok_button),
+	"clicked", G_CALLBACK (gtk_widget_destroy), (gpointer) fs, G_CONNECT_AFTER);
+    g_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION(fs)->cancel_button),
+	"clicked", G_CALLBACK (gtk_widget_destroy), (gpointer) fs, G_CONNECT_AFTER);
 
     gtk_widget_show (fs);
     gtk_grab_add (fs); /* take focus from the settings dialog */
@@ -850,8 +855,8 @@ static GtkWidget
 
     widget = gtk_entry_new_with_max_length(128);
     button = gtk_button_new_with_label("...");
-    gtk_signal_connect(GTK_OBJECT(button), "clicked", 
-    	GTK_SIGNAL_FUNC(createFileSelector), widget);
+    g_signal_connect(GTK_OBJECT(button), "clicked", 
+    	G_CALLBACK(createFileSelector), widget);
     box = gtk_hbox_new(FALSE, 0);
     gtk_box_pack_end(GTK_BOX(box), button, FALSE, FALSE, 0);
     gtk_box_pack_end(GTK_BOX(box), widget, TRUE, TRUE, 0);
@@ -1005,18 +1010,18 @@ GnomePilotConduit *conduit_get_gpilot_conduit( guint32 pilotId )
 
   /* conduit signals */
   /*
-  gtk_signal_connect(retval, "copy_from_pilot", (GtkSignalFunc)copy_from_pilot ,NULL);
-  gtk_signal_connect(retval, "copy_to_pilot", (GtkSignalFunc) ,NULL);
-  gtk_signal_connect(retval, "merge_to_pilot", (GtkSignalFunc) ,NULL);
-  gtk_signal_connect(retval, "merge_from_pilot", (GtkSignalFunc)synchronize ,NULL);
+  g_signal_connect(retval, "copy_from_pilot", (GCallback)copy_from_pilot ,NULL);
+  g_signal_connect(retval, "copy_to_pilot", (GCallback) ,NULL);
+  g_signal_connect(retval, "merge_to_pilot", (GCallback) ,NULL);
+  g_signal_connect(retval, "merge_from_pilot", (GCallback)synchronize ,NULL);
   */
-  gtk_signal_connect(retval, "synchronize", (GtkSignalFunc)synchronize ,NULL);
+  g_signal_connect(retval, "synchronize", (GCallback)synchronize ,NULL);
 
   /* GUI signals */
-  gtk_signal_connect(retval, "create_settings_window", (GtkSignalFunc)create_settings_window ,NULL);
-  gtk_signal_connect(retval, "display_settings", (GtkSignalFunc)display_settings ,NULL);
-  gtk_signal_connect(retval, "save_settings", (GtkSignalFunc)save_settings ,NULL);
-  gtk_signal_connect(retval, "revert_settings", (GtkSignalFunc)revert_settings ,NULL);
+  g_signal_connect(retval, "create_settings_window", (GCallback)create_settings_window ,NULL);
+  g_signal_connect(retval, "display_settings", (GCallback)display_settings ,NULL);
+  g_signal_connect(retval, "save_settings", (GCallback)save_settings ,NULL);
+  g_signal_connect(retval, "revert_settings", (GCallback)revert_settings ,NULL);
 
   load_configuration(&cfg1, pilotId );
   cfg2 = dupe_configuration(cfg1);
diff --git a/expense/expense_conduit.c b/expense/expense_conduit.c
index aac2a87..b96db70 100644
--- a/expense/expense_conduit.c
+++ b/expense/expense_conduit.c
@@ -415,13 +415,13 @@ insert_ignore_space_cb (GtkEditable    *editable, const gchar    *text,
         curname = gtk_entry_get_text(GTK_ENTRY(editable));
         if (*curname == '\0' && len > 0) {
                 if (isspace(text[0])) {
-                        gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
+                        g_signal_stop_emission_by_name(GTK_OBJECT(editable), "insert_text");
                         return;
                 }
         } else {
                 for (i=0; i<len; i++) {
                         if (isspace(text[i])) {
-                                gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), 
+                                g_signal_stop_emission_by_name(GTK_OBJECT(editable), 
                                                              "insert_text");
                                 return;
                         }
@@ -437,7 +437,7 @@ insert_numeric_cb(GtkEditable    *editable, const gchar    *text,
 
 	for (i=0; i<len; i++) {
 		if (!isdigit(text[i])) {
-			gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
+			g_signal_stop_emission_by_name(GTK_OBJECT(editable), "insert_text");
 			return;
 		}
 	}
@@ -560,8 +560,8 @@ static GtkWidget
 		gtk_object_set_data(GTK_OBJECT(vbox), fields[i].obj_data, entry);
 		gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 
                                  widget_offset+i, widget_offset+i+1, 0,0,0,0);
-		gtk_signal_connect(GTK_OBJECT(entry), "insert_text",
-				   GTK_SIGNAL_FUNC(fields[i].insert_func),
+		g_signal_connect(GTK_OBJECT(entry), "insert_text",
+				   G_CALLBACK(fields[i].insert_func),
 				   NULL);
 	}
 	
@@ -596,7 +596,7 @@ setOptionsCfg(GtkWidget *pilotcfg, ConduitCfg *state)
 	gtk_entry_set_text(GTK_ENTRY(FileMode),buf);
 
         /* find the entry in the option menu. if not found, default to the last */
-        for(i = 0; i < DATE_OPTIONS_COUNT && g_strncasecmp(state->dateFormat, date_options[i].format, 20) != 0; i++);
+        for(i = 0; i < DATE_OPTIONS_COUNT && g_ascii_strncasecmp(state->dateFormat, date_options[i].format, 20) != 0; i++);
         gtk_option_menu_set_history(GTK_OPTION_MENU(DateFormat), i);
 
         for(i = 0; i < WRITEOUT_OPTIONS_COUNT && state->outputFormat != writeout_options[i].format; i++);
@@ -678,17 +678,17 @@ GnomePilotConduit *conduit_get_gpilot_conduit( guint32 pilotId )
         retval = gnome_pilot_conduit_standard_new("ExpenseDB", Expense_Creator, NULL);
         g_assert(retval != NULL);
 
-        gtk_signal_connect(retval, "copy_from_pilot", (GtkSignalFunc)copy_from_pilot ,NULL);
+        g_signal_connect(retval, "copy_from_pilot", (GCallback)copy_from_pilot ,NULL);
         /*
-          gtk_signal_connect(retval, "copy_to_pilot", (GtkSignalFunc) ,NULL);
-          gtk_signal_connect(retval, "merge_to_pilot", (GtkSignalFunc) ,NULL);
-          gtk_signal_connect(retval, "merge_from_pilot", (GtkSignalFunc) ,NULL);
+          g_signal_connect(retval, "copy_to_pilot", (GCallback) ,NULL);
+          g_signal_connect(retval, "merge_to_pilot", (GCallback) ,NULL);
+          g_signal_connect(retval, "merge_from_pilot", (GCallback) ,NULL);
         */
-        gtk_signal_connect(retval, "synchronize", (GtkSignalFunc)synchronize ,NULL);
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, NULL);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, NULL);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, NULL);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, NULL);
+        g_signal_connect(retval, "synchronize", (GCallback)synchronize ,NULL);
+	g_signal_connect (retval, "create_settings_window", (GCallback) create_settings_window, NULL);
+	g_signal_connect (retval, "display_settings", (GCallback) display_settings, NULL);
+	g_signal_connect (retval, "save_settings", (GCallback) save_settings, NULL);
+	g_signal_connect (retval, "revert_settings", (GCallback) revert_settings, NULL);
 
 	load_configuration(&cfg,pilotId);
 	cfg2 = dupe_configuration(cfg);
diff --git a/memo/memo-conduit-control-applet.c b/memo/memo-conduit-control-applet.c
index 7f2ed23..c8c1556 100644
--- a/memo/memo-conduit-control-applet.c
+++ b/memo/memo-conduit-control-applet.c
@@ -101,13 +101,13 @@ insert_dir_callback (GtkEditable    *editable, const gchar    *text,
     curname = gtk_entry_get_text(GTK_ENTRY(editable));
     if (*curname == '\0' && len > 0) {
 	if (isspace(text[0])) {
-	    gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
+	    g_signal_stop_emission_by_name(GTK_OBJECT(editable), "insert_text");
 	    return;
 	}
     } else {
 	for (i=0; i<len; i++) {
 	    if (isspace(text[i])) {
-		gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), 
+		g_signal_stop_emission_by_name(GTK_OBJECT(editable), 
 					     "insert_text");
 		return;
 	    }
@@ -168,8 +168,8 @@ static GtkWidget
 
     button = gtk_check_button_new();
     gtk_object_set_data(GTK_OBJECT(vbox), "conduit_on_off", button);
-    gtk_signal_connect(GTK_OBJECT(button), "toggled",
-		       GTK_SIGNAL_FUNC(toggled_cb),
+    g_signal_connect(GTK_OBJECT(button), "toggled",
+		       G_CALLBACK(toggled_cb),
 		       NULL);
     gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 1,2);
 
@@ -222,14 +222,14 @@ pilot_capplet_setup(void)
     cfgStateWindow = createStateCfgWindow();
     gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);
 
-    gtk_signal_connect(GTK_OBJECT(capplet), "try",
-			GTK_SIGNAL_FUNC(doTrySettings), curState);
-    gtk_signal_connect(GTK_OBJECT(capplet), "revert",
-			GTK_SIGNAL_FUNC(doRevertSettings), curState);
-    gtk_signal_connect(GTK_OBJECT(capplet), "ok",
-			GTK_SIGNAL_FUNC(doSaveSettings), curState);
-    gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			GTK_SIGNAL_FUNC(about_cb), NULL);
+    g_signal_connect(GTK_OBJECT(capplet), "try",
+			G_CALLBACK(doTrySettings), curState);
+    g_signal_connect(GTK_OBJECT(capplet), "revert",
+			G_CALLBACK(doRevertSettings), curState);
+    g_signal_connect(GTK_OBJECT(capplet), "ok",
+			G_CALLBACK(doSaveSettings), curState);
+    g_signal_connect(GTK_OBJECT(capplet), "help",
+			G_CALLBACK(about_cb), NULL);
 
 
     setStateCfg(cfgStateWindow,curState);
diff --git a/memo/memo_conduit.c b/memo/memo_conduit.c
index c2ca733..d3a8f68 100644
--- a/memo/memo_conduit.c
+++ b/memo/memo_conduit.c
@@ -326,24 +326,24 @@ conduit_get_gpilot_conduit (guint32 pilotId)
   LOG("creating memo_conduit",0);
 
   g_assert (retval != NULL);
-  gtk_signal_connect (retval, "match_record", (GtkSignalFunc) match_record, NULL);
-  gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, NULL);
-  gtk_signal_connect (retval, "archive_local", (GtkSignalFunc) archive_local, NULL);
-  gtk_signal_connect (retval, "archive_remote", (GtkSignalFunc) archive_remote, NULL);
-  gtk_signal_connect (retval, "store_remote", (GtkSignalFunc) store_remote, NULL);
-  gtk_signal_connect (retval, "clear_status_archive_local", (GtkSignalFunc) clear_status_archive_local, NULL);
-  gtk_signal_connect (retval, "iterate", (GtkSignalFunc) iterate, NULL);
-  gtk_signal_connect (retval, "iterate_specific", (GtkSignalFunc) iterate_specific, NULL);
-  gtk_signal_connect (retval, "purge", (GtkSignalFunc) purge, NULL);
-  gtk_signal_connect (retval, "set_status", (GtkSignalFunc) set_status, NULL);
-  gtk_signal_connect (retval, "set_archived", (GtkSignalFunc) set_archived, NULL);
-  gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, NULL);
-  gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, NULL);
-  gtk_signal_connect (retval, "compare_backup", (GtkSignalFunc) compare_backup, NULL);
-  gtk_signal_connect (retval, "free_transmit", (GtkSignalFunc) free_transmit, NULL);
-  gtk_signal_connect (retval, "delete_all", (GtkSignalFunc) delete_all, NULL);
-  gtk_signal_connect (retval, "transmit", (GtkSignalFunc) transmit, NULL);
-  gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, NULL);
+  g_signal_connect (retval, "match_record", (GCallback) match_record, NULL);
+  g_signal_connect (retval, "free_match", (GCallback) free_match, NULL);
+  g_signal_connect (retval, "archive_local", (GCallback) archive_local, NULL);
+  g_signal_connect (retval, "archive_remote", (GCallback) archive_remote, NULL);
+  g_signal_connect (retval, "store_remote", (GCallback) store_remote, NULL);
+  g_signal_connect (retval, "clear_status_archive_local", (GCallback) clear_status_archive_local, NULL);
+  g_signal_connect (retval, "iterate", (GCallback) iterate, NULL);
+  g_signal_connect (retval, "iterate_specific", (GCallback) iterate_specific, NULL);
+  g_signal_connect (retval, "purge", (GCallback) purge, NULL);
+  g_signal_connect (retval, "set_status", (GCallback) set_status, NULL);
+  g_signal_connect (retval, "set_archived", (GCallback) set_archived, NULL);
+  g_signal_connect (retval, "set_pilot_id", (GCallback) set_pilot_id, NULL);
+  g_signal_connect (retval, "compare", (GCallback) compare, NULL);
+  g_signal_connect (retval, "compare_backup", (GCallback) compare_backup, NULL);
+  g_signal_connect (retval, "free_transmit", (GCallback) free_transmit, NULL);
+  g_signal_connect (retval, "delete_all", (GCallback) delete_all, NULL);
+  g_signal_connect (retval, "transmit", (GCallback) transmit, NULL);
+  g_signal_connect (retval, "pre_sync", (GCallback) pre_sync, NULL);
 
   load_configuration(&cc,pilotId);
   gtk_object_set_data(GTK_OBJECT(retval),"memo_conduit_config",cc);
diff --git a/memo_file/memo_file_conduit.c b/memo_file/memo_file_conduit.c
index 80c45ef..f25c9a1 100644
--- a/memo_file/memo_file_conduit.c
+++ b/memo_file/memo_file_conduit.c
@@ -1220,13 +1220,13 @@ insert_ignore_space (GtkEditable    *editable, const gchar    *text,
 	curname = gtk_entry_get_text (GTK_ENTRY (editable));
 	if (*curname == '\0' && len > 0) {
 		if (isspace (text[0])) {
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (editable), "insert_text");
+			g_signal_stop_emission_by_name (GTK_OBJECT (editable), "insert_text");
 			return;
 		}
 	} else { 
 		for (i=0; i<len; i++) {
 			if (isspace (text[i])) {
-				gtk_signal_emit_stop_by_name (GTK_OBJECT (editable),"insert_text");
+				g_signal_stop_emission_by_name (GTK_OBJECT (editable),"insert_text");
 				return;
 			}
 		}
@@ -1242,7 +1242,7 @@ insert_numeric_callback (GtkEditable    *editable, const gchar    *text,
 
 	for (i=0; i<len; i++) {
 		if (!isdigit (text[i])) {
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (editable), "insert_text");
+			g_signal_stop_emission_by_name (GTK_OBJECT (editable), "insert_text");
 			return;
 		}
 	}
@@ -1299,16 +1299,16 @@ static GtkWidget
 		entry = gtk_entry_new_with_max_length (128);
 		gtk_object_set_data (GTK_OBJECT (vbox), fields[i].obj_data, entry);
 		gtk_table_attach (GTK_TABLE (table), entry, 2, 3, i, i+1, 0, 0, 0, 0);
-		gtk_signal_connect (GTK_OBJECT (entry), "insert_text",
-				   GTK_SIGNAL_FUNC (fields[i].insert_func),
+		g_signal_connect (GTK_OBJECT (entry), "insert_text",
+				   G_CALLBACK (fields[i].insert_func),
 				   NULL);
 	}
 	
 	button = gtk_check_button_new ();
 
 	gtk_object_set_data (GTK_OBJECT (vbox),"secret_on", button);
-	gtk_signal_connect (GTK_OBJECT (button), "toggled",
-			   GTK_SIGNAL_FUNC (secret_toggled_cb),
+	g_signal_connect (GTK_OBJECT (button), "toggled",
+			   G_CALLBACK (secret_toggled_cb),
 			   conduit);
 	gtk_table_attach (GTK_TABLE (table), button, 0, 1, 5, 6, 0, 0, 0, 0); /* 5, 6 is badly hard-coded here. */
 
@@ -1438,27 +1438,27 @@ conduit_get_gpilot_conduit (guint32 pilotId)
 	LOG ("creating memo_file conduit");
 
 	g_assert (retval != NULL);
-	gtk_signal_connect (retval, "match_record", (GtkSignalFunc) match_record, NULL);
-	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, NULL);
-	gtk_signal_connect (retval, "archive_local", (GtkSignalFunc) archive_local, NULL);
-	gtk_signal_connect (retval, "archive_remote", (GtkSignalFunc) archive_remote, NULL);
-	gtk_signal_connect (retval, "store_remote", (GtkSignalFunc) store_remote, NULL);
-	gtk_signal_connect (retval, "iterate", (GtkSignalFunc) iterate, NULL);
-	gtk_signal_connect (retval, "iterate_specific", (GtkSignalFunc) iterate_specific, NULL);
-	gtk_signal_connect (retval, "purge", (GtkSignalFunc) purge, NULL);
-	gtk_signal_connect (retval, "set_status", (GtkSignalFunc) set_status, NULL);
-	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, NULL);
-	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, NULL);
-	gtk_signal_connect (retval, "compare_backup", (GtkSignalFunc) compare_backup, NULL);
-	gtk_signal_connect (retval, "free_transmit", (GtkSignalFunc) free_transmit, NULL);
-	gtk_signal_connect (retval, "delete_all", (GtkSignalFunc) delete_all, NULL);
-	gtk_signal_connect (retval, "transmit", (GtkSignalFunc) transmit, NULL);
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, NULL);
-
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, NULL);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, NULL);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, NULL);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, NULL);
+	g_signal_connect (retval, "match_record", (GCallback) match_record, NULL);
+	g_signal_connect (retval, "free_match", (GCallback) free_match, NULL);
+	g_signal_connect (retval, "archive_local", (GCallback) archive_local, NULL);
+	g_signal_connect (retval, "archive_remote", (GCallback) archive_remote, NULL);
+	g_signal_connect (retval, "store_remote", (GCallback) store_remote, NULL);
+	g_signal_connect (retval, "iterate", (GCallback) iterate, NULL);
+	g_signal_connect (retval, "iterate_specific", (GCallback) iterate_specific, NULL);
+	g_signal_connect (retval, "purge", (GCallback) purge, NULL);
+	g_signal_connect (retval, "set_status", (GCallback) set_status, NULL);
+	g_signal_connect (retval, "set_pilot_id", (GCallback) set_pilot_id, NULL);
+	g_signal_connect (retval, "compare", (GCallback) compare, NULL);
+	g_signal_connect (retval, "compare_backup", (GCallback) compare_backup, NULL);
+	g_signal_connect (retval, "free_transmit", (GCallback) free_transmit, NULL);
+	g_signal_connect (retval, "delete_all", (GCallback) delete_all, NULL);
+	g_signal_connect (retval, "transmit", (GCallback) transmit, NULL);
+	g_signal_connect (retval, "pre_sync", (GCallback) pre_sync, NULL);
+
+	g_signal_connect (retval, "create_settings_window", (GCallback) create_settings_window, NULL);
+	g_signal_connect (retval, "display_settings", (GCallback) display_settings, NULL);
+	g_signal_connect (retval, "save_settings", (GCallback) save_settings, NULL);
+	g_signal_connect (retval, "revert_settings", (GCallback) revert_settings, NULL);
 
 	load_configuration (GNOME_PILOT_CONDUIT (retval), &cfg, pilotId);
 	cfg2 = dupe_configuration (cfg);
diff --git a/time/time-conduit.c b/time/time-conduit.c
index 34815de..786d452 100644
--- a/time/time-conduit.c
+++ b/time/time-conduit.c
@@ -221,11 +221,11 @@ conduit_load_gpilot_conduit (GPilotPilot *pilot)
 	gtk_object_set_data(GTK_OBJECT(retval),OBJ_DATA_CONFIG,cfg);
 	gtk_object_set_data(GTK_OBJECT(retval),OBJ_DATA_OLDCONFIG,cfg2);
 
-	gtk_signal_connect (retval, "synchronize", (GtkSignalFunc)synchronize, cfg);
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc)create_settings_window, NULL);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc)display_settings, NULL);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc)save_settings, NULL);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc)revert_settings, NULL);
+	g_signal_connect (retval, "synchronize", (GCallback)synchronize, cfg);
+	g_signal_connect (retval, "create_settings_window", (GCallback)create_settings_window, NULL);
+	g_signal_connect (retval, "display_settings", (GCallback)display_settings, NULL);
+	g_signal_connect (retval, "save_settings", (GCallback)save_settings, NULL);
+	g_signal_connect (retval, "revert_settings", (GCallback)revert_settings, NULL);
 
 	return GNOME_PILOT_CONDUIT (retval);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]