r562 - trunk/src/target/OM-2007/applications/openmoko-appmanager/src

caowai_song at sita.openmoko.org caowai_song at sita.openmoko.org
Tue Jan 16 08:50:33 CET 2007


Author: caowai_song
Date: 2007-01-16 08:49:42 +0100 (Tue, 16 Jan 2007)
New Revision: 562

Modified:
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.c
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.c
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/errorcode.h
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.h
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.c
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.h
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.c
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.h
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.c
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c
Log:
Remove some C++ styles comments


Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.c	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.c	2007-01-16 07:49:42 UTC (rev 562)
@@ -28,8 +28,8 @@
  * @brief The id of package list that display in apply dialog.
  */
 enum {
-  MARK_COL_NAME = 0,      ///<Package name
-  MARK_NUM_COL            ///<Column number
+  MARK_COL_NAME = 0,      /* Package name */
+  MARK_NUM_COL            /* Column number */
 };
 
 /**
@@ -53,7 +53,7 @@
   GtkCellRenderer     *renderer;
   GtkTreeStore    *store;
 
-  // Create a new dialog and add a GtkTreeview and two button to the dialog
+  /* Create a new dialog and add a GtkTreeview and two button to the dialog */
   applydialog = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (applydialog), _("summary"));
   gtk_window_set_position (GTK_WINDOW (applydialog), GTK_WIN_POS_CENTER_ALWAYS);
@@ -90,7 +90,7 @@
   gtk_dialog_add_action_widget (GTK_DIALOG (applydialog), okbutton, GTK_RESPONSE_OK);
   GTK_WIDGET_SET_FLAGS (okbutton, GTK_CAN_DEFAULT);
 
-  // Add column to the treeview
+  /* Add column to the treeview */
   col = gtk_tree_view_column_new ();
   gtk_tree_view_column_set_title (col, _("Package Name"));
 

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h	2007-01-16 07:49:42 UTC (rev 562)
@@ -52,31 +52,31 @@
  * FIXME Maybe use a GObject as the base class is the better.
  */
 typedef struct _ApplicationManagerData {
-  GObject          parent;             ///<! The parent of the struct
+  GObject          parent;             /* The parent of the struct */
 
-  MokoPanedWindow  *mwindow;           ///<! The main window
-  GtkMenu          *filtermenu;        ///<! The filter menu
-  GtkMenu          *selectmenu;        ///<! The select menu
-  GtkEntry         *searchentry;       ///<! The search entry
-  GtkWidget        *tvpkglist;         ///<! The treeview of the package list
-  GtkWidget        *tvdetail;          ///<! The textview of the details info
-  gpointer         pkglist;            ///<! The package list get from lib ipkg
-  gpointer         sectionlist;        ///<! The section list parse from the package list
-  gpointer         installedlist;      ///<! The list of all installed packages
-  gpointer         upgradelist;        ///<! The list of all upgradeable packages
-  gpointer         selectedlist;       ///<! The list of packages that user selected
-  gpointer         nosecpkglist;       ///<! The list of packages whose section name is NULL
-  gpointer         currentlist;        ///<! The current list that display on the navigation list
-  GdkPixbuf        *statuspix[N_COUNT_PKG_STATUS];    ///<! The all pixbufs that need by the package list store
-  gchar            *searchhistory;     ///<! The search history
-  GtkWidget        *installdialog;     ///<! The install dialog
+  MokoPanedWindow  *mwindow;           /* The main window */
+  GtkMenu          *filtermenu;        /* The filter menu */
+  GtkMenu          *selectmenu;        /* The select menu */
+  GtkEntry         *searchentry;       /* The search entry */
+  GtkWidget        *tvpkglist;         /* The treeview of the package list */
+  GtkWidget        *tvdetail;          /* The textview of the details info */
+  gpointer         pkglist;            /* The package list get from lib ipkg */
+  gpointer         sectionlist;        /* The section list parse from the package list */
+  gpointer         installedlist;      /* The list of all installed packages */
+  gpointer         upgradelist;        /* The list of all upgradeable packages */
+  gpointer         selectedlist;       /* The list of packages that user selected */
+  gpointer         nosecpkglist;       /* The list of packages whose section name is NULL */
+  gpointer         currentlist;        /* The current list that display on the navigation list */
+  GdkPixbuf        *statuspix[N_COUNT_PKG_STATUS];    /* The all pixbufs that need by the package list store */
+  gchar            *searchhistory;     /* The search history */
+  GtkWidget        *installdialog;     /* The install dialog */
 } ApplicationManagerData;
 
 /**
  * @brief The class struct of application manager data
  */
 typedef struct _ApplicationManagerDataClass {
-  GObjectClass    parent_class;        ///<! The parent class
+  GObjectClass    parent_class;        /* The parent class */
 } ApplicationManagerDataClass;
 
 GType application_manager_data_get_type (void);

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c	2007-01-16 07:49:42 UTC (rev 562)
@@ -141,7 +141,7 @@
 
   if (argc != 1)
     {
-      //Add init code.
+      /* Add init code. */
     }
   lockapp = testlock ("/tmp/appmgr.lock");
   if (lockapp > 0)
@@ -160,15 +160,12 @@
 
   init_pixbuf_list (appdata);
 
-  //app = MOKO_APPLICATION (moko_application_get_instance ());
-  //g_set_application_name (_("Application manager"));
-
   window = MOKO_PANED_WINDOW (moko_paned_window_new ());
   g_signal_connect (G_OBJECT (window), "delete_event", 
                     G_CALLBACK (gtk_main_quit), NULL);
   application_manager_data_set_main_window (appdata, window);
 
-  // Save the main window
+  /* Save the main window */
   mainwindow = GTK_WIDGET(window);
 
   appmenu = application_menu_new (appdata);
@@ -191,7 +188,7 @@
   detail = detail_area_new (appdata);
   moko_paned_window_set_lower_pane (window, detail);
 
-  //Load the list of all package in the memory
+  /* Load the list of all package in the memory */
   ret = init_package_list (appdata);
   if (ret != OP_SUCCESS)
     {

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.c	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.c	2007-01-16 07:49:42 UTC (rev 562)
@@ -108,7 +108,7 @@
   gtk_text_buffer_set_text (buffer, "", -1);
   g_return_if_fail (pkg != NULL);
 
-  // Init tag
+  /* Init tag */
   tagtable = gtk_text_buffer_get_tag_table (buffer);
   if (gtk_text_tag_table_lookup (tagtable, "bold") == NULL)
     {
@@ -118,37 +118,37 @@
                                   NULL);
     }
 
-  // Insert the pixmap of the package
-  // FIXME It needs a way to lookup the picture
+  /* Insert the pixmap of the package
+     FIXME It needs a way to lookup the picture */
   pix = create_pixbuf ("unkown.png");
 
   gtk_text_buffer_get_start_iter (buffer, &start);
   gtk_text_buffer_insert_pixbuf (buffer, &start, pix);
 
-  // Insert package name
+  /* Insert package name */
   gtk_text_buffer_get_end_iter (buffer, &end);
   pstart = gtk_text_iter_get_offset (&end);
   gtk_text_buffer_insert (buffer, &end, 
                           package_list_get_package_name (pkg),
                           -1);
 
-  // Insert the "\n"
+  /* Insert the "\n" */
   gtk_text_buffer_get_end_iter (buffer, &end);
   gtk_text_buffer_insert (buffer, &end, "\n", -1);
 
-  // Insert the maintainer
+  /* Insert the maintainer */
   gtk_text_buffer_get_end_iter (buffer, &end);
   pend = gtk_text_iter_get_offset (&end);
   gtk_text_buffer_insert (buffer, &end, 
                           package_list_get_package_maintainer (pkg),
                           -1);
 
-  // Set bold to the first line
+  /* Set bold to the first line */
   gtk_text_buffer_get_iter_at_offset (buffer, &start, pstart);
   gtk_text_buffer_get_iter_at_offset (buffer, &end, pend);
   gtk_text_buffer_apply_tag_by_name (buffer, "bold", &start, &end);
 
-  // Set the Version
+  /* Set the Version */
   gtk_text_buffer_get_end_iter (buffer, &end);
   pstart = gtk_text_iter_get_offset (&end);
   gtk_text_buffer_insert (buffer, &end, "\nVersion\n\t", -1);
@@ -162,7 +162,7 @@
   gtk_text_buffer_get_iter_at_offset (buffer, &end, pend);
   gtk_text_buffer_apply_tag_by_name (buffer, "bold", &start, &end);
 
-  // Set the descript
+  /* Set the descript */
   gtk_text_buffer_get_end_iter (buffer, &end);
   pstart = gtk_text_iter_get_offset (&end);
   gtk_text_buffer_insert (buffer, &end, "\nDescription\n\t", -1);
@@ -176,7 +176,7 @@
   gtk_text_buffer_get_iter_at_offset (buffer, &end, pend);
   gtk_text_buffer_apply_tag_by_name (buffer, "bold", &start, &end);
 
-  // Set the depends
+  /* Set the depends */
   depends = package_list_get_package_depends (pkg);
   if (depends != NULL)
     {

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/errorcode.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/errorcode.h	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/errorcode.h	2007-01-16 07:49:42 UTC (rev 562)
@@ -24,12 +24,12 @@
  * @brief All available error code
  */
 typedef enum {
-  OP_SUCCESS = 0,                ///<! Operation success
-  OP_MAMORY_MALLOC_ERROR,        ///<! Mamory malloc error
+  OP_SUCCESS = 0,                /* Operation success */
+  OP_MAMORY_MALLOC_ERROR,        /* Mamory malloc error */
 
-  OP_SECTION_NAME_NULL,          ///<! The section of a package is NULL
+  OP_SECTION_NAME_NULL,          /* The section of a package is NULL */
 
-  OP_ERROR                       ///<! Operation error
+  OP_ERROR                       /* Operation error */
 } ErrorCode;
 
 #endif

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c	2007-01-16 07:49:42 UTC (rev 562)
@@ -37,18 +37,18 @@
  * @brief The private data of the Install dialog
  */
 typedef struct _InstallDialogPriv {
-  ApplicationManagerData   *maindata;    ///<! The main data of the application manager
-  gchar    **installinfolist;            ///<! The list of install/remove/upgrade infomation
-  gchar    **prepareinfolist;            ///<! The list of prepareinfomation
-  gint     preparenum;                   ///<! Prepare to install/remove/upgrade the _number_ package
-  gint     installnum;                   ///<! Installing/removing/upgrading the _number_ package 
-  gint     displaypreparenum;            ///<! Prepare info of the _number_ package has been displayed
-  gint     displayinstallnum;            ///<! Installed info of the _number_ package has been displayed 
-  gint     installstatus;                ///<! The status of the install process
-  gint     displaystatus;                ///<! The status of the display process
-  gboolean requestcancel;                ///<! Cancel the install status by user choice
-  GtkWidget  *textview;                  ///<! The textview in the dialog
-  gint     pkgnum;                       ///<! The number of packages that need be installed/upgraded/removed
+  ApplicationManagerData   *maindata;    /* The main data of the application manager */
+  gchar    **installinfolist;            /* The list of install/remove/upgrade infomation */
+  gchar    **prepareinfolist;            /* The list of prepareinfomation */
+  gint     preparenum;                   /* Prepare to install/remove/upgrade the _number_ package */
+  gint     installnum;                   /* Installing/removing/upgrading the _number_ package */
+  gint     displaypreparenum;            /* Prepare info of the _number_ package has been displayed */
+  gint     displayinstallnum;            /* Installed info of the _number_ package has been displayed */
+  gint     installstatus;                /* The status of the install process */
+  gint     displaystatus;                /* The status of the display process */
+  gboolean requestcancel;                /* Cancel the install status by user choice */
+  GtkWidget  *textview;                  /* The textview in the dialog */
+  gint     pkgnum;                       /* The number of packages that need be installed/upgraded/removed */
 } InstallDialogPriv;
 
 static void 
@@ -60,12 +60,14 @@
 static void 
 install_dialog_init (InstallDialog *self)
 {
-  InstallDialogPriv *priv = MOKO_INSTALL_DIALOG_GET_PRIVATE (self);
   GtkWidget  *vbox;
   GtkWidget  *scrollwindow;
   GtkWidget  *closebutton;
+  InstallDialogPriv *priv;
 
-  // Init the data
+  priv = MOKO_INSTALL_DIALOG_GET_PRIVATE(self);
+
+  /* Init the data */
   priv->maindata = NULL;
   priv->installinfolist = NULL;
   priv->prepareinfolist = NULL;
@@ -77,7 +79,7 @@
   priv->displaystatus = STATUS_INSTALL;
   priv->requestcancel = FALSE;
 
-  // Init the dialog
+  /* Init the dialog */
   gtk_widget_set_size_request (GTK_WIDGET (self), 480, 480);
   gtk_window_set_title (GTK_WINDOW (self), _("dialog1"));
   gtk_window_set_type_hint (GTK_WINDOW (self), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -202,7 +204,7 @@
 
   if (priv->installstatus == STATUS_ERROR)
     {
-      // FIXME An error appeared in the install process. Add code later.
+      /* FIXME An error appeared in the install process. Add code later. */
       return FALSE;
     }
 

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.h	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.h	2007-01-16 07:49:42 UTC (rev 562)
@@ -46,24 +46,24 @@
  * @brief Process status of the install dialog
  */
 enum {
-  STATUS_INSTALL,       ///<! Install/remove/upgrade packages
-  STATUS_REINIT,        ///<! Reinit the package list and navigation view
-  STATUS_ERROR,         ///<! There is error when install/remove/upgrade packages
-  STATUS_COMPLETE       ///<! The process of install/remove/upgrade packages completed
+  STATUS_INSTALL,       /* Install/remove/upgrade packages */
+  STATUS_REINIT,        /* Reinit the package list and navigation view */
+  STATUS_ERROR,         /* There is error when install/remove/upgrade packages */
+  STATUS_COMPLETE       /* The process of install/remove/upgrade packages completed */
 };
 
 /**
  * @brief The install dialog struct
  */
 typedef struct _InstallDialog {
-  GtkDialog          parent;             ///<! The parent of the struct
+  GtkDialog          parent;             /* The parent of the struct */
 } InstallDialog;
 
 /**
  * @brief The install dialog class struct
  */
 typedef struct _InstallDialogClass {
-  GtkDialogClass     parent_class;       ///<! The parent of the struct
+  GtkDialogClass     parent_class;       /* The parent of the struct */
 } InstallDialogClass;
 
 GType install_dialog_get_type (void);

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.c	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.c	2007-01-16 07:49:42 UTC (rev 562)
@@ -869,7 +869,7 @@
             DBG("Package %s is not installed.\n", pkg->name);
             continue;
         }
-        if (pkg->state_status == SS_NOT_INSTALLED) {    // Added the control, so every already removed package could be skipped
+        if (pkg->state_status == SS_NOT_INSTALLED) {    /* Added the control, so every already removed package could be skipped */
             DBG("Package seems to be %s not installed (STATUS = NOT_INSTALLED).\n", pkg->name);
             continue;
         }
@@ -959,7 +959,7 @@
     }
 
     /* recheck to verify that all dependences are satisfied */
-    //if (0) ipkg_satisfy_all_dependences(global_conf);
+    /* if (0) ipkg_satisfy_all_dependences(global_conf); */
 
     ipkg_configure_packages(&global_conf, NULL);
 

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.h	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.h	2007-01-16 07:49:42 UTC (rev 562)
@@ -27,40 +27,40 @@
  * @brief IPKG package structure.
  */
 typedef struct ipk_package {
-  int  mark;                        ///<package mark
-  char *name;                       ///<package name
-  char *version;                    ///<package version
-  char *section;                    ///<package section
-  char *size;                       ///<package size
-  char *depends;                    ///<dependency package
-  char *description;                ///<package description
-  char *maintainer;                 ///<package maintainer
-  pkg_state_status_t state_status;  ///<package status defined in libipkg/pkg.h
-  struct ipk_package *next;         ///<pointer to next package
+  int  mark;                        /* package mark */
+  char *name;                       /* package name */
+  char *version;                    /* package version */
+  char *section;                    /* package section */
+  char *size;                       /* package size */
+  char *depends;                    /* dependency package */
+  char *description;                /* package description */
+  char *maintainer;                 /* package maintainer */
+  pkg_state_status_t state_status;  /* package status defined in libipkg/pkg.h */
+  struct ipk_package *next;         /* pointer to next package */
 }IPK_PACKAGE;
 
 /**
  * @brief IPKG package list head structure.
  */
 typedef struct pkg_list_head {
-  int length;                   ///<the number of installed packages
-  IPK_PACKAGE *pkg_list;        ///<package list head pointer
+  int length;                   /* the number of installed packages */
+  IPK_PACKAGE *pkg_list;        /* package list head pointer */
 }PKG_LIST_HEAD;
 
 /**
  * @brief IPKG package detail information structure.
  */
 typedef struct package_detail_info {
-  char *name;                       ///<package name
-  char *version;                    ///<package version
-  char *depends;                    ///<dependency package
-  char *description;                ///<package description
-  char *section;                    ///<package section
-  char *size;                       ///<package size
-  char *filename;                   ///<package file name
-  char *installed_size;             ///<package installed size
-  char *maintainer;                 ///<package maintainer
-  pkg_state_status_t state_status;  ///<package status
+  char *name;                       /* package name */
+  char *version;                    /* package version */
+  char *depends;                    /* dependency package */
+  char *description;                /* package description */
+  char *section;                    /* package section */
+  char *size;                       /* package size */
+  char *filename;                   /* package file name */
+  char *installed_size;             /* package installed size */
+  char *maintainer;                 /* package maintainer */
+  pkg_state_status_t state_status;  /* package status */
 }PACKAGE_DETAIL_INFO;
 
 
@@ -72,7 +72,7 @@
     PKG_INSTALLED = 1,
     PKG_AVAILABLE
 };
-typedef enum pkg_query_status pkg_query_status_t; ///<IPKG package query status
+typedef enum pkg_query_status pkg_query_status_t; /* IPKG package query status */
 
 
 int ipkg_initialize(int noreadfeedsfile);

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.c	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.c	2007-01-16 07:49:42 UTC (rev 562)
@@ -156,7 +156,7 @@
   gtk_widget_show (treeview);
   gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeview), FALSE);
 
-  ///<! Add the status as the first column.
+  /* Add the status as the first column. */
   col = gtk_tree_view_column_new ();
   gtk_tree_view_column_set_title (col, _("S"));
   gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
@@ -169,12 +169,12 @@
 
   moko_tree_view_append_column (MOKO_TREE_VIEW (treeview), col);
 
-  ///<! For some reason, there must set the column length to fixed
+  /* For some reason, there must set the column length to fixed */
   gtk_tree_view_column_set_resizable (col, FALSE);
   gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED);
   gtk_tree_view_column_set_fixed_width (col, 20);
 
-  ///<! Add the name as the second column.
+  /* Add the name as the second column. */
   col = gtk_tree_view_column_new ();
   gtk_tree_view_column_set_title (col, _("Name"));
   gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
@@ -187,12 +187,12 @@
 
   moko_tree_view_append_column (MOKO_TREE_VIEW (treeview), col);
 
-  ///<! For some reason, there must set the column length to fixed
+  /* For some reason, there must set the column length to fixed */
   gtk_tree_view_column_set_resizable (col, FALSE);
   gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED);
   gtk_tree_view_column_set_fixed_width (col, 240);
 
-  ///<! Add the size as the third column.
+  /* Add the size as the third column. */
   col = gtk_tree_view_column_new ();
   gtk_tree_view_column_set_title (col, _("Size"));
 
@@ -208,15 +208,15 @@
   model = GTK_TREE_MODEL (create_package_list_store ());
   gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), model);
   g_object_unref (model);
-  // FIXME Set the treeview as the single selection mode now.
-  // Maybe it uses the multi selection mode in the feature. 
+  /* FIXME Set the treeview as the single selection mode now.
+     Maybe it uses the multi selection mode in the feature. */
   gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
                                GTK_SELECTION_SINGLE);
 
   scrollwindow = GTK_WIDGET (moko_tree_view_put_into_scrolled_window (MOKO_TREE_VIEW (treeview)));
   application_manager_data_set_tvpkglist (appdata, treeview);
 
-  // Connect signal to the treeview
+  /* Connect signal to the treeview */
   g_signal_connect ((gpointer) treeview, "cursor_changed",
                     G_CALLBACK (on_treeview_cursor_changed),
                     appdata);
@@ -360,7 +360,7 @@
   gtk_list_store_clear (store);
 
   translate_package_list_to_store (appdata, store, pkglist);
-  // Save current list to the application manager data
+  /* Save current list to the application manager data */
   application_manager_data_set_current_list (appdata, pkglist);
 
   gtk_tree_view_set_model (GTK_TREE_VIEW(treeview), model);
@@ -415,7 +415,7 @@
   gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), NULL);
   gtk_list_store_clear (store);
 
-  //FIXME Add search and build the store
+  /* FIXME Add search and build the store */
   search_and_translate_package_list_to_store (appdata, store, pkglist, str);
 
   gtk_tree_view_set_model (GTK_TREE_VIEW(treeview), model);

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c	2007-01-16 07:49:42 UTC (rev 562)
@@ -31,19 +31,19 @@
  * @brief The structor of Package list node
  */
 typedef struct package_list {
-  IPK_PACKAGE *pkg;                ///<Package info
-  struct package_list *pre;        ///<The previous node of package list
-  struct package_list *next;       ///<The next node of package list
+  IPK_PACKAGE *pkg;                /* Package info */
+  struct package_list *pre;        /* The previous node of package list */
+  struct package_list *next;       /* The next node of package list */
 } PackageList;
 
 /**
  * @brief Section list structure.
  */
 typedef struct section_list {
-  char *name;                      ///<Section name
-  int  sequence;                   ///<The sequence in section list
-  PackageList head;               ///<The first node of package list at this section
-  struct section_list *next;       ///<The next section list node
+  char *name;                      /* Section name */
+  int  sequence;                   /* The sequence in section list */
+  PackageList head;                /* The first node of package list at this section */
+  struct section_list *next;       /* The next section list node */
 } SectionList;
 
 static gint package_list_insert_node_without_check (PackageList *pkglist, IPK_PACKAGE *pkg);
@@ -123,7 +123,7 @@
   ret = ipkg_initialize (0);
   if (ret != 0)
     {
-      //Can't initialize the lib ipkg
+      /* Can't initialize the lib ipkg */
       g_debug ("Can not initialize the libipkg, the result is %d\nthe error message is:%s",
                ret, get_error_msg());
       return OP_ERROR;
@@ -132,7 +132,7 @@
   ret = ipkg_list_available_cmd (head);
   if (ret != 0)
     {
-      //Can't get the package list correctly
+      /* Can't get the package list correctly */
       g_debug ("Can not get the package list, the result is %d\nthe error message is:%s",
                ret, get_error_msg());
       g_free (head);
@@ -167,7 +167,7 @@
   ret = ipkg_list_available_cmd (head);
   if (ret != 0)
     {
-      //Can't get the package list correctly
+      /* Can't get the package list correctly */
       g_debug ("Can not get the package list, the result is %d\nthe error message is:%s",
                ret, get_error_msg());
       g_free (head);
@@ -258,7 +258,7 @@
 
       if (ret == 0)
         {
-          //Find it.
+          /* Find it. */
           *section = tmp;
           return OP_SUCCESS;
         }
@@ -340,8 +340,8 @@
   PackageList *selected = NULL;
   PackageList *nosecpkg = NULL;
 
-  // Get the section list from the application manager data
-  // If the section list is not NULL, clear it.
+  /* Get the section list from the application manager data
+     If the section list is not NULL, clear it. */
   sectionlist = (SectionList *) application_manager_data_get_sectionlist (appdata);
   if (sectionlist != NULL)
     {
@@ -350,8 +350,8 @@
       application_manager_data_set_section_list (appdata, sectionlist);
     }
 
-  // Get the installed list from the application manager data
-  // If the installed list is not NULL, clear it.
+  /* Get the installed list from the application manager data
+     If the installed list is not NULL, clear it. */
   installed = (PackageList *)application_manager_data_get_installedlist (appdata);
   if (installed != NULL)
     {
@@ -361,8 +361,8 @@
       application_manager_data_set_installed_list (appdata, installed);
     }
 
-  // Get the upgrade list from the application manager data
-  // If the upgrade list is not NULL, clear it.
+  /* Get the upgrade list from the application manager data
+     If the upgrade list is not NULL, clear it. */
   upgrade = (PackageList *)application_manager_data_get_upgradelist (appdata);
   if (upgrade != NULL)
     {
@@ -372,8 +372,8 @@
       application_manager_data_set_upgrade_list (appdata, upgrade);
     }
 
-  // Get the selected list from the application manager data
-  // If the selected list is not NULL, clear it.
+  /* Get the selected list from the application manager data
+     If the selected list is not NULL, clear it. */
   selected = (PackageList *)application_manager_data_get_upgradelist (appdata);
   if (selected != NULL)
     {
@@ -383,8 +383,8 @@
       application_manager_data_set_upgrade_list (appdata, selected);
     }
 
-  // Get the nosecpkg list from the application manager data
-  // If the selected list is not NULL, clear it.
+  /* Get the nosecpkg list from the application manager data
+     If the selected list is not NULL, clear it. */
   nosecpkg = (PackageList *)application_manager_data_get_upgradelist (appdata);
   if (nosecpkg != NULL)
     {
@@ -438,19 +438,19 @@
   tmp = pkglist->pkg;
   if (tmp->state_status != SS_INSTALLED)
     {
-      // If the package in the list is not installed, 
-      // check the other one.
+      /* If the package in the list is not installed, 
+         check the other one. */
       if (pkg->state_status == SS_INSTALLED)
         {
-          // If the other one is installed, exchange them
+          /* If the other one is installed, exchange them */
           pkglist->pkg = pkg;
           pkg = tmp;
           tmp = pkglist->pkg;
         }
       else
         {
-          // If the other one is not installed either, 
-          // set the package with high version to the list.
+          /* If the other one is not installed either, 
+             set the package with high version to the list.*/
           ret = verrevcmp (tmp->version, pkg->version);
           if (ret < 0)
             {
@@ -499,7 +499,7 @@
 
       if (ret > 0) 
         {
-          //The name of package is larger then the name of node
+          /* The name of package is larger then the name of node */
           ins = (PackageList *) g_malloc (sizeof (PackageList));
           if (ins == NULL)
             {
@@ -515,11 +515,11 @@
 
           return OP_SUCCESS;
         }
-      // FIXME  Ignore the names of two packages are equal
-      // At this condition, if there are two packages with the same name,
-      // add every of them to the package list
+      /* FIXME  Ignore the names of two packages are equal
+         At this condition, if there are two packages with the same name,
+         add every of them to the package list */
 
-      //The name of package is small then the name of node, search the pre node.
+      /* The name of package is small then the name of node, search the pre node. */
       tmp = tmp->pre;
     }
 
@@ -562,7 +562,7 @@
 
       if (ret > 0) 
         {
-          //The name of package is larger then the name of node
+          /* The name of package is larger then the name of node */
           ins = (PackageList *) g_malloc (sizeof (PackageList));
           if (ins == NULL)
             {
@@ -580,14 +580,14 @@
         }
       else if (ret == 0)
         {
-          //The name of package is equal to the name of node.
-          //The package maybe an upgradeable package.
+          /* The name of package is equal to the name of node.
+             The package maybe an upgradeable package. */
           g_debug ("The package maybe upgradeable. Package name is:%s", pkg->name);
           g_debug ("The pkg version 1 is:%s, The version 2 is:%s", tmp->pkg->version, pkg->version);
           return check_package_upgradeable (tmp, pkg, upgrade);
         }
 
-      //The name of package is small then the name of node, search the pre node.
+      /* The name of package is small then the name of node, search the pre node. */
       tmp = tmp->pre;
     }
 
@@ -628,7 +628,7 @@
   SectionList   *tmpsec = NULL;
   gint          ret;
 
-  // Get the package list from application manager data
+  /* Get the package list from application manager data */
   pkglist = (PKG_LIST_HEAD *) application_manager_data_get_pkglist (appdata);
   if (pkglist == NULL)
     {
@@ -642,10 +642,10 @@
       return OP_ERROR;
     }
 
-  // Clear the old data
+  /* Clear the old data */
   package_list_clear_old_index (appdata);
 
-  // Malloc memory for the head
+  /* Malloc memory for the head */
   sectionlist = g_malloc (sizeof (SectionList));
   if (sectionlist == NULL)
     {
@@ -691,7 +691,7 @@
       return OP_MAMORY_MALLOC_ERROR;
     }
 
-  // Init each list
+  /* Init each list */
   g_debug ("Begin init each list");
 
   section_list_init_node (sectionlist);
@@ -701,19 +701,19 @@
   package_list_init_node (selected);
   package_list_init_node (nosecpkg);
 
-  // Set the header of each list to the application manager data
+  /* Set the header of each list to the application manager data */
   application_manager_data_set_section_list (appdata, sectionlist);
   application_manager_data_set_installed_list (appdata, installed);
   application_manager_data_set_upgrade_list (appdata, upgrade);
   application_manager_data_set_selected_list (appdata, selected);
   application_manager_data_set_nosecpkg_list (appdata, nosecpkg);
 
-  // Start to build the index for all packages
+  /* Start to build the index for all packages */
   pkg = pkglist->pkg_list;
 
   while (pkg != NULL)
     {
-      // Check wheather the package was installed
+      /* Check wheather the package was installed */
       if (pkg->state_status == SS_INSTALLED)
         {
           pkg->mark = PKG_STATUS_INSTALLED;
@@ -728,7 +728,7 @@
           pkg->mark = PKG_STATUS_AVAILABLE;
         }
 
-      //Search the section node of package.
+      /* Search the section node of package. */
       ret = package_list_search_section_node (pkg->section, &tmpsec, sectionlist);
       if (ret == OP_SUCCESS)
         {
@@ -1239,9 +1239,9 @@
 
           default:
             break;
-        } // end switch
+        } /* end switch */
       tmplist = tmplist->next;
-    }// end while
+    } /* end while */
 }
 
 /**
@@ -1286,7 +1286,7 @@
                       tmplist->pkg->name);
             install_dialog_add_prepare_info (MOKO_INSTALL_DIALOG (installdialog),
                                              tmpstr);
-            //FIXME The newname of the packages are not used now.
+            /* FIXME The newname of the packages are not used now. */
             g_debug ("Begin to install:%s", tmplist->pkg->name);
             ret = ipkg_install_cmd (tmplist->pkg->name, "root",  &newname);
             g_debug ("************************************************");
@@ -1305,7 +1305,7 @@
                 errstr = g_malloc (res + 100);
                 if (errstr == NULL)
                   {
-                    // FIXME Add error manager code here
+                    /* FIXME Add error manager code here */
                     g_debug ("errstr malloc menory NULL");
                     install_dialog_add_install_info (MOKO_INSTALL_DIALOG (installdialog),
                                                      get_error_msg ());
@@ -1331,7 +1331,7 @@
                       tmplist->pkg->name);
             install_dialog_add_prepare_info (MOKO_INSTALL_DIALOG (installdialog),
                                              tmpstr);
-            //FIXME The newname of the packages are not used now.
+            /* FIXME The newname of the packages are not used now. */
             ret = ipkg_install_cmd (tmplist->pkg->name, "root",  &newname);
             if (ret == 0)
               {
@@ -1347,7 +1347,7 @@
                 errstr = g_malloc (res + 100);
                 if (errstr == NULL)
                   {
-                    // FIXME Add error manager code here
+                    /* FIXME Add error manager code here */
                     install_dialog_add_install_info (MOKO_INSTALL_DIALOG (installdialog),
                                                      get_error_msg ());
                     break;
@@ -1370,7 +1370,7 @@
                       tmplist->pkg->name);
             install_dialog_add_prepare_info (MOKO_INSTALL_DIALOG (installdialog),
                                              tmpstr);
-            //FIXME The newname of the packages are not used now.
+            /* FIXME The newname of the packages are not used now. */
             ret = ipkg_remove_cmd (tmplist->pkg->name);
             if (ret == 0)
               {
@@ -1386,7 +1386,7 @@
                 errstr = g_malloc (res + 100);
                 if (errstr == NULL)
                   {
-                    // FIXME Add error manager code here
+                    /* FIXME Add error manager code here */
                     install_dialog_add_install_info (MOKO_INSTALL_DIALOG (installdialog),
                                                      get_error_msg ());
                     break;
@@ -1437,7 +1437,7 @@
           g_debug ("Can not build index for packages");
           return NULL;
         }
-      // FIXME Add reinit filter menu code late
+      /* FIXME Add reinit filter menu code late */
     }
 
   install_dialog_set_install_status (MOKO_INSTALL_DIALOG (installdialog),

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.h	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.h	2007-01-16 07:49:42 UTC (rev 562)
@@ -28,14 +28,14 @@
  * The id is used to find the related pixbuf from pixbuf list.
  */
 typedef enum _pkgstatusid {
-  PKG_STATUS_AVAILABLE = 0,                ///<Package is available and not installed.
-  PKG_STATUS_INSTALLED,                    ///<Package is installed and can not be upgrade.
-  PKG_STATUS_UPGRADEABLE,                  ///<Package is installed and can be upgrade.
-  PKG_STATUS_AVAILABLE_MARK_FOR_INSTALL,   ///<Available package is marked for install.
-  PKG_STATUS_INSTALLED_MARK_FOR_REMOVE,    ///<Installed package is marked for remove.
-  PKG_STATUS_UPGRADEABLE_MARK_FOR_UPGRADE, ///<Upgradeable package is marked for upgrade.
-  PKG_STATUS_UPGRADEABLE_MARK_FOR_REMOVE,  ///<Upgradeable package is mark for remove.
-  N_COUNT_PKG_STATUS                       ///<The number of valid status.
+  PKG_STATUS_AVAILABLE = 0,                /* Package is available and not installed. */
+  PKG_STATUS_INSTALLED,                    /* Package is installed and can not be upgrade. */
+  PKG_STATUS_UPGRADEABLE,                  /* Package is installed and can be upgrade. */
+  PKG_STATUS_AVAILABLE_MARK_FOR_INSTALL,   /* Available package is marked for install. */
+  PKG_STATUS_INSTALLED_MARK_FOR_REMOVE,    /* Installed package is marked for remove. */
+  PKG_STATUS_UPGRADEABLE_MARK_FOR_UPGRADE, /* Upgradeable package is marked for upgrade. */
+  PKG_STATUS_UPGRADEABLE_MARK_FOR_REMOVE,  /* Upgradeable package is mark for remove. */
+  N_COUNT_PKG_STATUS                       /* The number of valid status. */
 } PkgStatusId;
 
 GdkPixbuf *create_pixbuf (const gchar *filename);

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.c	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.c	2007-01-16 07:49:42 UTC (rev 562)
@@ -139,7 +139,7 @@
     {
       case PKG_STATUS_AVAILABLE:
         pkgid = PKG_STATUS_AVAILABLE_MARK_FOR_INSTALL;
-        // FIXME Add the package to the mark list
+        /* FIXME Add the package to the mark list */
         package_list_add_node_to_selected_list (appdata, pkg);
         break;
 
@@ -191,7 +191,7 @@
   switch (pkgid)
     {
       case PKG_STATUS_UPGRADEABLE:
-        //FIXME Add insert pkg to the select list
+        /* FIXME Add insert pkg to the select list */
         package_list_add_node_to_selected_list (appdata, pkg);
 
       case PKG_STATUS_UPGRADEABLE_MARK_FOR_REMOVE:

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c	2007-01-16 07:47:58 UTC (rev 561)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c	2007-01-16 07:49:42 UTC (rev 562)
@@ -78,7 +78,7 @@
   dialog = apply_dialog_new (MOKO_APPLICATION_MANAGER_DATA (data));
   res = gtk_dialog_run (GTK_DIALOG (dialog));
 
-  //FIXME Add code to install/remove/upgrade package
+  /* FIXME Add code to install/remove/upgrade package */
   if (res == GTK_RESPONSE_OK)
     {
       g_debug ("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
@@ -125,7 +125,7 @@
 
   if (searchstr[0] == '\0')
     {
-      //FIXME Add code later
+      /* FIXME Add code later */
       g_debug ("The length of search string is 0");
       navigation_area_rebuild_from_latest (appdata);
       return;





More information about the commitlog mailing list