comparison src/gtk/bookmarks.c @ 609:d97e985f5dbe

2004-11-3 Brian Masney <[e-mail]> * lib/config_file.c (gftp_bookmarks_destroy) src/gtk/bookmarks.c (bm_apply_changes) - cleaned up the tree parsing code * lib/gftp.h lib/misc.c lib/config_file.c src/gtk/bookmarks.c - added free_node argument to gftp_free_bookmark() * lib/gftp.h src/gtk/bookmarks.c - added oldpath variable to the gftp_bookmarks structure.

608:7e575601841a

      else
        {
          test.item_type = "";
          test.callback = run_bookmark;
        }
      gtk_item_factory_create_item (factory, &test,
                                    (gpointer) tempentry->path, 1);
      g_free (test.path);
      if (tempentry->children != NULL)
        {

  return (new_bm);
}


static void
bm_apply_changes (GtkWidget * widget, gpointer backup_data)
{
  gftp_bookmarks_var * tempentry, * delentry;
  char *tempstr;

  if (bm_dialog != NULL)
    {
      gtk_widget_grab_focus (bm_dialog);
      return;

  if (gftp_bookmarks != NULL)
    {
      tempentry = gftp_bookmarks->children;
      while (tempentry != NULL)
        {
          if (tempentry->path && !tempentry->isfolder)
            {
              tempstr = g_strdup_printf ("/Bookmarks/%s", tempentry->path);
              gtk_widget_destroy (gtk_item_factory_get_item (factory, tempstr));
              g_free (tempentry->path);
              g_free (tempstr);
            }
    
          gftp_free_bookmark (tempentry);
    
          if (tempentry->children != NULL)
            tempentry = tempentry->children;
          else
            {
              if (tempentry->next == NULL)
                {
                  while (tempentry->next == NULL && tempentry->prev != NULL)
                    {
                      delentry = tempentry;
                      tempentry = tempentry->prev;
                      if (delentry->isfolder)
                        {
                          tempstr = g_strdup_printf ("/Bookmarks/%s", 
                                                     delentry->path);
                          gtk_widget_destroy (gtk_item_factory_get_item (factory, 
                                                                         tempstr));
                          g_free (tempstr);
                          g_free (delentry->path);
                        }
                      g_free (delentry);
                    }

                  delentry = tempentry;
                  tempentry = tempentry->next;
                  if (delentry->isfolder && tempentry != NULL)
                    {
                      tempstr = g_strdup_printf ("/Bookmarks/%s", 
                                                 delentry->path);
                      gtk_widget_destroy (gtk_item_factory_get_item (factory, 
                                                                     tempstr));
                      g_free (delentry->path);
                      g_free (tempstr);
                      g_free (delentry);
                    }
                }
              else
                {
                  delentry = tempentry;
                  tempentry = tempentry->next;
                  g_free (delentry);
                }
            }
        }
    
      g_free (gftp_bookmarks);
      g_hash_table_destroy (gftp_bookmarks_htable);
    }

  if (backup_data)
    {
      gftp_bookmarks = copy_bookmarks (new_bookmarks);
      gftp_bookmarks_htable = build_bookmarks_hash_table (new_bookmarks);
    }
  else
    {
      gftp_bookmarks = new_bookmarks;
      gftp_bookmarks_htable = new_bookmarks_htable;

			                     opendir_bitmap, FALSE, FALSE);
  else
    newentry->cnode = gtk_ctree_insert_node (GTK_CTREE (tree), 
                                             new_bookmarks->cnode, NULL,
                                             text, 5, NULL, NULL, NULL, NULL, 
                                             FALSE, FALSE);

  gtk_ctree_node_set_row_data (GTK_CTREE (tree), newentry->cnode, newentry);
  g_hash_table_insert (new_bookmarks_htable, newentry->path, newentry);
}

  entry->prev = NULL;
  entry->next = NULL;
  tempentry = entry;
  while (tempentry != NULL)
    {
      gftp_free_bookmark (tempentry);

      if (tempentry->children != NULL)
	{
	  tempentry = tempentry->children;
	  continue;

            pos++;
    
          text[0] = text[1] = pos;
          tempentry->cnode = gtk_ctree_insert_node (GTK_CTREE (tree), 
                                 tempentry->prev->cnode, NULL, text, 5, NULL,
                                 NULL, NULL, NULL, FALSE, FALSE);
          gtk_ctree_node_set_row_data (GTK_CTREE (tree), tempentry->cnode,
                                       tempentry);
        }

      while (tempentry->next == NULL && tempentry->prev != NULL)

static void
entry_apply_changes (GtkWidget * widget, gftp_bookmarks_var * entry)
{
  char *pos, *newpath, tempchar, *tempstr, *origpath;
  gftp_bookmarks_var * tempentry, * nextentry;
  GtkWidget * tempwid;
  size_t oldpathlen;
  const char *str;

  tempstr = g_strdup (gtk_entry_get_text (GTK_ENTRY (bm_pathedit)));

  if ((pos = strrchr (entry->path, '/')) == NULL)
    pos = entry->path;

  tempchar = *pos;
  *pos = '\0';
  origpath = newpath = gftp_build_path (NULL, entry->path, tempstr, NULL);
  *pos = tempchar;

  g_free (tempstr);

  str = gtk_entry_get_text (GTK_ENTRY (bm_hostedit));

      entry->next = NULL;
      while (tempentry != NULL)
	{
	  g_hash_table_remove (new_bookmarks_htable, tempentry->path);

          if (*(tempentry->path + oldpathlen) == '\0')
	    tempstr = g_strdup (newpath);
          else
	    tempstr = gftp_build_path (NULL, newpath,
                                       tempentry->path + oldpathlen, NULL);

	  g_free (tempentry->path);
	  tempentry->path = tempstr;
	  g_hash_table_insert (new_bookmarks_htable, tempentry->path,
                               tempentry);
	  if (tempentry->children != NULL)
	    {
	      tempentry = tempentry->children;

	}

      entry->next = nextentry;
    }

  g_free (origpath);
}


#if GTK_MAJOR_VERSION == 1

609:d97e985f5dbe

      else
        {
          test.item_type = "";
          test.callback = run_bookmark;
        }

      gtk_item_factory_create_item (factory, &test,
                                    (gpointer) tempentry->path, 1);
      g_free (test.path);
      if (tempentry->children != NULL)
        {

  return (new_bm);
}


static void
_free_menu_entry (gftp_bookmarks_var * entry)
{
  GtkWidget * tempwid;
  char *tempstr;

  if (entry->oldpath != NULL)
    tempstr = gftp_build_path (NULL, "/Bookmarks", entry->oldpath, NULL);
  else
    tempstr = gftp_build_path (NULL, "/Bookmarks", entry->path, NULL);

  tempwid = gtk_item_factory_get_item (factory, tempstr);
  if (GTK_IS_WIDGET (tempwid))
    gtk_widget_destroy (tempwid);

  g_free (tempstr);
}


static void
bm_apply_changes (GtkWidget * widget, gpointer backup_data)
{
  gftp_bookmarks_var * tempentry, * delentry;

  if (bm_dialog != NULL)
    {
      gtk_widget_grab_focus (bm_dialog);
      return;

  if (gftp_bookmarks != NULL)
    {
      tempentry = gftp_bookmarks->children;
      while (tempentry != NULL)
        {
          if (tempentry->children != NULL)
            tempentry = tempentry->children;
          else
            {
              while (tempentry->next == NULL && tempentry->prev != NULL)
                {
                  delentry = tempentry;
                  tempentry = tempentry->prev;
                  _free_menu_entry (delentry);
                  gftp_free_bookmark (delentry, 1);
                }

              delentry = tempentry;
              tempentry = tempentry->next;
              if (tempentry != NULL)
                _free_menu_entry (delentry);

              gftp_free_bookmark (delentry, 1);
            }
        }

      g_hash_table_destroy (gftp_bookmarks_htable);
    }

  if (backup_data)
    {
      gftp_bookmarks = copy_bookmarks (new_bookmarks);
      gftp_bookmarks_htable = build_bookmarks_hash_table (gftp_bookmarks);
    }
  else
    {
      gftp_bookmarks = new_bookmarks;
      gftp_bookmarks_htable = new_bookmarks_htable;

			                     opendir_bitmap, FALSE, FALSE);
  else
    newentry->cnode = gtk_ctree_insert_node (GTK_CTREE (tree), 
                                             new_bookmarks->cnode, NULL,
                                             text, 5, NULL, NULL, NULL, NULL, 
                                             TRUE, FALSE);

  gtk_ctree_node_set_row_data (GTK_CTREE (tree), newentry->cnode, newentry);
  g_hash_table_insert (new_bookmarks_htable, newentry->path, newentry);
}

  entry->prev = NULL;
  entry->next = NULL;
  tempentry = entry;
  while (tempentry != NULL)
    {
      gftp_free_bookmark (tempentry, 0);

      if (tempentry->children != NULL)
	{
	  tempentry = tempentry->children;
	  continue;

            pos++;
    
          text[0] = text[1] = pos;
          tempentry->cnode = gtk_ctree_insert_node (GTK_CTREE (tree), 
                                 tempentry->prev->cnode, NULL, text, 5, NULL,
                                 NULL, NULL, NULL, TRUE, FALSE);
          gtk_ctree_node_set_row_data (GTK_CTREE (tree), tempentry->cnode,
                                       tempentry);
        }

      while (tempentry->next == NULL && tempentry->prev != NULL)

static void
entry_apply_changes (GtkWidget * widget, gftp_bookmarks_var * entry)
{
  gftp_bookmarks_var * tempentry, * nextentry;
  char *pos, *newpath, tempchar, *tempstr;
  GtkWidget * tempwid;
  size_t oldpathlen;
  const char *str;

  tempstr = g_strdup (gtk_entry_get_text (GTK_ENTRY (bm_pathedit)));

  if ((pos = strrchr (entry->path, '/')) == NULL)
    pos = entry->path;

  tempchar = *pos;
  *pos = '\0';
  newpath = gftp_build_path (NULL, entry->path, tempstr, NULL);
  *pos = tempchar;

  g_free (tempstr);

  str = gtk_entry_get_text (GTK_ENTRY (bm_hostedit));

      entry->next = NULL;
      while (tempentry != NULL)
	{
	  g_hash_table_remove (new_bookmarks_htable, tempentry->path);

          if (tempentry->oldpath == NULL)
            tempentry->oldpath = tempentry->path;
          else
            g_free (tempentry->path);

          if (*(tempentry->path + oldpathlen) == '\0')
	    tempentry->path = g_strdup (newpath);
          else
	    tempentry->path = gftp_build_path (NULL, newpath,
                                               tempentry->path + oldpathlen,
                                               NULL);

	  g_hash_table_insert (new_bookmarks_htable, tempentry->path,
                               tempentry);
	  if (tempentry->children != NULL)
	    {
	      tempentry = tempentry->children;

	}

      entry->next = nextentry;
    }

  g_free (newpath);
}


#if GTK_MAJOR_VERSION == 1