[Ayttm-commits] CVS: ayttm/src prefs_window.c,1.5.2.5,1.5.2.6 prefs_window.h,1.1.2.2,1.1.2.3

[Andy Maloney <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv468/src

Modified Files:
      Tag: new_prefs
        prefs_window.c prefs_window.h 
Log Message:
Move function from prefs_window.[ch] to where they belong
Namespace cleanup


Index: prefs_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs_window.c,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -r1.5.2.5 -r1.5.2.6
--- prefs_window.c      28 Mar 2003 18:04:36 -0000      1.5.2.5
+++ prefs_window.c      29 Mar 2003 19:32:28 -0000      1.5.2.6
@@ -75,7 +75,7 @@
 static void destroy(GtkWidget * widget, gpointer data);
 
 
-void prefs_window_create( struct prefs *inPrefs )
+void   ayttm_prefs_window_create( struct prefs *inPrefs )
 {
      if ( !s_is_prefs_open )
      {
@@ -915,15 +915,16 @@
        PLUGIN_ERROR_COL
 };
 
-const int      s_plugin_info_columns = 7;
+const int      s_plugin_info_num_columns = 7;
 
 static GtkWidget       *plugin_prefs_win = NULL;
 
 static void    build_modules_list( GtkWidget * module_list )
 {
-       const char      *row_data[s_plugin_info_columns];       
+       const char      *row_data[s_plugin_info_num_columns];   
        LList           *module_info = s_prefs->module.module_info;
        
+       
        for ( ; module_info != NULL; module_info = module_info->next )
        {
                module_pref             *pref_info = module_info->data;
@@ -931,62 +932,20 @@
                if ( pref_info == NULL )
                        continue;
                                        
-               eb_debug(DBG_CORE, "Adding plugin %s\n", pref_info->name);
-               
-               row_data[0] = pref_info->type;
-               row_data[1] = pref_info->brief_desc;
-               row_data[2] = pref_info->status;
-               row_data[3] = pref_info->version;
-               row_data[4] = pref_info->date;
-               row_data[5] = pref_info->name;
-               if ( pref_info->status_desc )
-                       row_data[6] = pref_info->status_desc;
-               else
-                       row_data[6] = "";
+               eb_debug( DBG_CORE, "Adding plugin %s\n", pref_info->file_name 
);
+                               
+               row_data[PLUGIN_TYPE_COL] = (pref_info->module_type == NULL) ? 
"" : pref_info->module_type;
+               row_data[PLUGIN_BRIEF_COL] = (pref_info->brief_desc == NULL) ? 
"" : pref_info->brief_desc;
+               row_data[PLUGIN_STATUS_COL] = (pref_info->loaded_status == 
NULL) ? "" : pref_info->loaded_status;
+               row_data[PLUGIN_VERSION_COL] = (pref_info->version == NULL) ? 
"" : pref_info->version;
+               row_data[PLUGIN_DATE_COL] = (pref_info->date == NULL) ? "" : 
pref_info->date;
+               row_data[PLUGIN_PATH_COL] = (pref_info->file_name == NULL) ? "" 
: pref_info->file_name;
+               row_data[PLUGIN_ERROR_COL] = (pref_info->status_desc == NULL) ? 
"" : pref_info->status_desc;
                        
                gtk_clist_append( GTK_CLIST(module_list), (char **)row_data );
        }
 }
 
-void rebuild_set_status_menu()
-{
-       GtkWidget *set_status_submenuitem;
-
-       set_status_submenuitem = GetPref("widget::set_status_submenuitem");
-       gtk_menu_item_remove_submenu(GTK_MENU_ITEM(set_status_submenuitem));
-       eb_set_status_window(set_status_submenuitem);
-       gtk_widget_draw(GTK_WIDGET(set_status_submenuitem), NULL);
-}
-
-void rebuild_import_menu()
-{
-       GtkWidget *import_submenuitem;
-
-       import_submenuitem = GetPref("widget::import_submenuitem");
-       if(!import_submenuitem) {
-               eb_debug(DBG_CORE, "Not rebuilding import menu, it's never been 
built.\n");
-               return;
-       }
-       gtk_menu_item_remove_submenu(GTK_MENU_ITEM(import_submenuitem));
-       eb_import_window(import_submenuitem);
-       gtk_widget_draw(GTK_WIDGET(import_submenuitem), NULL);
-}
-
-void rebuild_profile_menu()
-{
-       GtkWidget *profile_submenuitem;
-
-       profile_submenuitem = GetPref("widget::profile_submenuitem");
-       if(!profile_submenuitem) {
-               eb_debug(DBG_CORE, "Not rebuilding profile menu, it's never 
been built.\n");
-               return;
-       }
-       gtk_menu_item_remove_submenu(GTK_MENU_ITEM(profile_submenuitem));
-       eb_profile_window(profile_submenuitem);
-       gtk_widget_draw(GTK_WIDGET(profile_submenuitem), NULL);
-}
-
-
 static void update_plugin_prefs(GtkWidget * w, input_list *prefs)
 {
        if(prefs) {
@@ -1247,7 +1206,7 @@
        gtk_widget_set_usize(w, 400, 200);
        
        /* Need to create a new one each time window is created as the old one 
was destroyed */
-       module_list = gtk_clist_new_with_titles(s_plugin_info_columns, titles);
+       module_list = gtk_clist_new_with_titles(s_plugin_info_num_columns, 
titles);
        gtk_container_add(GTK_CONTAINER(w), module_list);
        gtk_widget_show(w);
        gtk_box_pack_start(GTK_BOX(vbox), w, TRUE, TRUE, 10);
@@ -1260,7 +1219,7 @@
        gtk_signal_connect(GTK_OBJECT(module_list), "click-column",
                        GTK_SIGNAL_FUNC(plugin_column_sort), NULL);
        gtk_clist_set_selection_mode(GTK_CLIST(module_list), 
GTK_SELECTION_SINGLE);
-       for(col=0;col<s_plugin_info_columns;col++)
+       for(col=0;col<s_plugin_info_num_columns;col++)
                gtk_clist_set_column_auto_resize(GTK_CLIST(module_list), col, 
TRUE);
        /* Make sure right mouse button works */
        gtk_clist_set_button_actions(GTK_CLIST(module_list), 1, 
GTK_BUTTON_SELECTS);

Index: prefs_window.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs_window.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- prefs_window.h      28 Mar 2003 12:40:58 -0000      1.1.2.2
+++ prefs_window.h      29 Mar 2003 19:32:28 -0000      1.1.2.3
@@ -28,19 +28,6 @@
 #include "prefs.h"
 
 
-void   prefs_window_create( struct prefs *inPrefs );
-
-void rebuild_import_menu();
-void rebuild_profile_menu();
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void rebuild_set_status_menu();
-
-#ifdef __cplusplus
-}
-#endif
+void   ayttm_prefs_window_create( struct prefs *inPrefs );
 
 #endif