[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Ayttm-commits] CVS: ayttm/src add_contact_window.c,1.14,1.15 extgtktex
From: |
Andy Maloney <address@hidden> |
Subject: |
[Ayttm-commits] CVS: ayttm/src add_contact_window.c,1.14,1.15 extgtktext.c,1.7,1.8 plugin.c,1.4,1.5 plugin.h,1.3,1.4 sound.c,1.9,1.10trigger.c,1.9,1.10 |
Date: |
Mon, 20 Jan 2003 20:11:04 -0500 |
Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv20796/src
Modified Files:
add_contact_window.c extgtktext.c plugin.c plugin.h sound.c
trigger.c
Log Message:
More static functions and header cleanup
Index: add_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_contact_window.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- add_contact_window.c 20 Jan 2003 20:33:18 -0000 1.14
+++ add_contact_window.c 21 Jan 2003 01:11:01 -0000 1.15
@@ -20,12 +20,11 @@
*/
#include "intl.h"
+
#include <string.h>
-#include <gtk/gtk.h>
+
#include "service.h"
#include "status.h"
-#include "account.h"
-#include "contact.h"
#include "util.h"
#include "dialog.h"
#include "add_contact_window.h"
@@ -104,25 +103,7 @@
* this gets a list of all accounts associated with a contact
*/
-GList * get_accounts(gchar *contact)
-{
- GList *node = NULL, *newlist = NULL;
- struct contact * c;
-
- c = find_contact_by_nick(contact);
-
- if(c)
- node = c->accounts;
-
- while(node) {
- newlist = g_list_append(newlist, ((eb_account
*)node->data)->handle);
- node = node->next;
- }
-
- return newlist;
-}
-
-GList * get_eb_accounts(gchar *contact)
+static GList * get_eb_accounts(gchar *contact)
{
GList *node = NULL, *newlist = NULL;
struct contact * c;
@@ -159,7 +140,7 @@
return newlist;
}
-void dif_group(GtkEditable *editable, gpointer user_data)
+static void dif_group(GtkEditable *editable, gpointer user_data)
{
GList * list = get_contacts(COMBO_TEXT(group_name));
gtk_signal_handler_block(GTK_OBJECT(GTK_COMBO(contact_name)->entry),
@@ -172,7 +153,7 @@
/*This is the function for changing the contact entry*/
-void set_con(GtkEditable *editable, gpointer user_data)
+static void set_con(GtkEditable *editable, gpointer user_data)
{
if(flag == 0){
gtk_signal_handler_block(GTK_OBJECT(GTK_COMBO(contact_name)->entry),
@@ -186,12 +167,12 @@
/*callback that sets the flag if the contact name has been modified*/
-void con_modified(GtkEditable *editable, gpointer user_data)
+static void con_modified(GtkEditable *editable, gpointer user_data)
{
flag = 1;
}
-void add_button_callback(GtkButton *button, gpointer userdata)
+static void add_button_callback(GtkButton *button, gpointer userdata)
{
grouplist *gl;
struct contact *con;
@@ -238,7 +219,7 @@
* Create a Add contact window and put it on the screen
*/
-void show_add_defined_contact_window(struct contact * cont, grouplist *grp)
+static void show_add_defined_contact_window(struct contact * cont, grouplist
*grp)
{
/*
* if the add contact window is already open, we don't want to
Index: extgtktext.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/extgtktext.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- extgtktext.c 16 Jan 2003 13:11:01 -0000 1.7
+++ extgtktext.c 21 Jan 2003 01:11:01 -0000 1.8
@@ -37,17 +37,13 @@
*/
/*
- * Modified by Torrey Searle for use with Ayttm
+ * Modified by Torrey Searle for use with Everybuddy
* added support for Horizontal Divider rendering
* Fixed some rendering glitches with the image rendering
*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include "intl.h"
+
#include <ctype.h>
#include <string.h>
#include <gdk/gdkkeysyms.h>
@@ -55,7 +51,8 @@
#include <gtk/gtkmain.h>
#include <gtk/gtkselection.h>
#include <gtk/gtksignal.h>
-#include <gdk/gdkprivate.h>
+#include <gdk/gdkprivate.h>
+
#include "extgtktext.h"
#include "globals.h"
#include "plugin_api.h"
@@ -1064,7 +1061,7 @@
draw_cursor (text, FALSE);
}
-void
+static void
ext_gtk_text_insert_alltypes (ExtGtkText *text,
VFont *font,
GdkColor *fore,
Index: plugin.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/plugin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.c 16 Jan 2003 13:11:01 -0000 1.4
+++ plugin.c 21 Jan 2003 01:11:01 -0000 1.5
@@ -19,11 +19,8 @@
*
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include "intl.h"
+
#ifdef __MINGW32__
typedef long __off32_t;
#endif
@@ -46,35 +43,28 @@
"Loaded",
"Cannot Load"};
-PLUGIN_INFO Plugin_Cannot_Load = {PLUGIN_UNKNOWN,
+static PLUGIN_INFO Plugin_Cannot_Load = {PLUGIN_UNKNOWN,
"Unknown",
"Unknown",
"Unknown",
"Unknown", NULL, NULL, NULL, NULL};
-gint compare_plugin_loaded_service(gconstpointer a, gconstpointer b) {
+static gint compare_plugin_loaded_service(gconstpointer a, gconstpointer b) {
const eb_PLUGIN_INFO *epi=a;
if(epi->service && epi->status==PLUGIN_LOADED && !strcmp( epi->service,
(char *)b))
return(0);
return(1);
}
-gint compare_plugin_name(gconstpointer a, gconstpointer b) {
+static gint compare_plugin_name(gconstpointer a, gconstpointer b) {
const eb_PLUGIN_INFO *epi=a;
if(epi->name && !strcmp( epi->name, (char *)b))
return(0);
return(1);
}
-gint compare_plugin_handle(gconstpointer a, gconstpointer b) {
- const eb_PLUGIN_INFO *epi=a;
- if( epi->Module && epi->Module == (lt_dlhandle )b)
- return(0);
- return(1);
-}
-
-eb_PLUGIN_INFO *FindLoadedPluginByService(char *service)
+static eb_PLUGIN_INFO *FindLoadedPluginByService(char *service)
{
GList *plugins=GetPref(EB_PLUGIN_LIST);
GList *PluginData = g_list_find_custom(plugins, service,
compare_plugin_loaded_service);
@@ -92,17 +82,9 @@
return(NULL);
}
-eb_PLUGIN_INFO *FindPluginByHandle(lt_dlhandle *Module)
-{
- GList *plugins=GetPref(EB_PLUGIN_LIST);
- GList *PluginData = g_list_find_custom(plugins, Module,
compare_plugin_handle);
- if(PluginData)
- return(PluginData->data);
- return(NULL);
-}
/* Will add/update info about a plugin */
-void SetPluginInfo(PLUGIN_INFO *pi, char *name, lt_dlhandle Module,
PLUGIN_STATUS status, const char *status_desc, char *service, gboolean force)
+static void SetPluginInfo(PLUGIN_INFO *pi, char *name, lt_dlhandle Module,
PLUGIN_STATUS status, const char *status_desc, char *service, gboolean force)
{
GList *plugins=NULL;
eb_PLUGIN_INFO *epi=NULL;
@@ -144,7 +126,7 @@
}
/* Find names which end in .la, the expected module extension */
-int select_module_entry(const struct dirent *dent) {
+static int select_module_entry(const struct dirent *dent) {
int len=0;
char *ext;
@@ -417,7 +399,7 @@
}
/* Make sure that all the plugin_api accessible menus are initialized */
-int init_menu(char *menu_name, menu_func redraw_menu, ebmType type)
+static int init_menu(char *menu_name, menu_func redraw_menu, ebmType type)
{
menu_data *md=NULL;
Index: plugin.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/plugin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.h 16 Jan 2003 13:11:01 -0000 1.3
+++ plugin.h 21 Jan 2003 01:11:01 -0000 1.4
@@ -69,7 +69,6 @@
} menu_data;
eb_PLUGIN_INFO *FindPluginByName(char *name);
-eb_PLUGIN_INFO *FindPluginByService(char *service);
int unload_module(eb_PLUGIN_INFO *epi);
void unload_modules();
Index: sound.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/sound.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sound.c 20 Jan 2003 20:33:18 -0000 1.9
+++ sound.c 21 Jan 2003 01:11:01 -0000 1.10
@@ -143,7 +143,7 @@
#define BIAS 0x84 /* define the add-in bias for 16 bit samples */
#define CLIP 32635
-unsigned char linear2ulaw(int sample)
+static unsigned char linear2ulaw(int sample)
{
static int exp_lut[256] = {0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,
4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
@@ -409,7 +409,7 @@
}
#endif /* ARTS_SOUND */
-char* auscale(char* infile, char*outfile, float scaling)
+static char* auscale(char* infile, char*outfile, float scaling)
{
#ifndef __MINGW32__
FILE *fd_in = NULL;
@@ -564,7 +564,7 @@
* I modified this function to use fstat, much cleaner...
*/
-gboolean file_ok(gchar *soundfile)
+static gboolean file_ok(gchar *soundfile)
{
gchar message[1024];
Index: trigger.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/trigger.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- trigger.c 20 Jan 2003 12:33:45 -0000 1.9
+++ trigger.c 21 Jan 2003 01:11:01 -0000 1.10
@@ -26,7 +26,6 @@
#include <string.h>
#include <stdlib.h>
-#include "contact.h"
#include "chat_window.h"
#include "dialog.h"
#include "sound.h"
@@ -261,7 +260,7 @@
return "\0";
}
-GList *get_trigger_list()
+static GList *get_trigger_list()
{
triggers = NULL;
@@ -273,7 +272,7 @@
return triggers;
}
-GList *get_action_list()
+static GList *get_action_list()
{
actions = NULL;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Ayttm-commits] CVS: ayttm/src add_contact_window.c,1.14,1.15 extgtktext.c,1.7,1.8 plugin.c,1.4,1.5 plugin.h,1.3,1.4 sound.c,1.9,1.10trigger.c,1.9,1.10,
Andy Maloney <address@hidden> <=
- Prev by Date:
[Ayttm-commits] CVS: ayttm ChangeLog,1.168,1.169 configure.in,1.164,1.165
- Next by Date:
[Ayttm-commits] CVS: ayttm/src chat_room.c,1.35,1.36 chat_window.c,1.27,1.28 dialog.h,1.7,1.8 smileys.c,1.9,1.10 smileys.h,1.3,1.4util.h,1.10,1.11
- Previous by thread:
[Ayttm-commits] CVS: ayttm ChangeLog,1.168,1.169 configure.in,1.164,1.165
- Next by thread:
[Ayttm-commits] CVS: ayttm/src chat_room.c,1.35,1.36 chat_window.c,1.27,1.28 dialog.h,1.7,1.8 smileys.c,1.9,1.10 smileys.h,1.3,1.4util.h,1.10,1.11
- Index(es):