SF.net SVN: geany: [2079] trunk - Commits

30 Nov 2007

Revision: 2079
          http://geany.svn.sourceforge.net/geany/?rev=2079&view=rev
Author:   ntrel
Date:     2007-11-30 09:34:01 -0800 (Fri, 30 Nov 2007)
Log Message:
-----------
Remove unused config_dir argument for tm_get_workspace().
Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/main.c
    trunk/tagmanager/include/tm_workspace.h
    trunk/tagmanager/tm_project.c
    trunk/tagmanager/tm_workspace.c
Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2007-11-29 18:24:06 UTC (rev 2078)
+++ trunk/ChangeLog	2007-11-30 17:34:01 UTC (rev 2079)
@@ -1,3 +1,10 @@
+2007-11-30  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/main.c, tagmanager/tm_project.c, tagmanager/tm_workspace.c,
+   tagmanager/include/tm_workspace.h:
+   Remove unused config_dir argument for tm_get_workspace().
+
+
 2007-11-29  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
* geany.glade, doc/geany.html, geany.txt, src/editor.c,
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2007-11-29 18:24:06 UTC (rev 2078)
+++ trunk/src/main.c	2007-11-30 17:34:01 UTC (rev 2079)
@@ -283,7 +283,7 @@
    prefs.tab_order_ltr		= FALSE;
    main_status.quitting			= FALSE;
    app->ignore_callback	= FALSE;
-	app->tm_workspace				= tm_get_workspace(app->configdir);
+	app->tm_workspace		= tm_get_workspace();
    ui_prefs.recent_queue				= g_queue_new();
    main_status.opening_session_files		= FALSE;
Modified: trunk/tagmanager/include/tm_workspace.h
===================================================================
--- trunk/tagmanager/include/tm_workspace.h	2007-11-29 18:24:06 UTC (rev 2078)
+++ trunk/tagmanager/include/tm_workspace.h	2007-11-30 17:34:01 UTC (rev 2079)
@@ -56,7 +56,7 @@
  a workspace is created. Subsequent calls to the function will return the
  created workspace.
 */
-const TMWorkspace *tm_get_workspace(const gchar *config_dir);
+const TMWorkspace *tm_get_workspace();
/*! Adds a work object (source file or project) to the workspace.
  \param work_object The work object to add to the project.
Modified: trunk/tagmanager/tm_project.c
===================================================================
--- trunk/tagmanager/tm_project.c	2007-11-29 18:24:06 UTC (rev 2078)
+++ trunk/tagmanager/tm_project.c	2007-11-30 17:34:01 UTC (rev 2079)
@@ -157,8 +157,7 @@
   ,gboolean update)
 {
    TMWorkObject *source_file;
-	/// TODO if this will be ever used, pass app->config_dir instead of NULL
-	const TMWorkObject *workspace = TM_WORK_OBJECT(tm_get_workspace(NULL));
+	const TMWorkObject *workspace = TM_WORK_OBJECT(tm_get_workspace());
    char *path;
    gboolean exists = FALSE;
Modified: trunk/tagmanager/tm_workspace.c
===================================================================
--- trunk/tagmanager/tm_workspace.c	2007-11-29 18:24:06 UTC (rev 2078)
+++ trunk/tagmanager/tm_workspace.c	2007-11-30 17:34:01 UTC (rev 2079)
@@ -29,7 +29,7 @@
 static TMWorkspace *theWorkspace = NULL;
 guint workspace_class_id = 0;
-static gboolean tm_create_workspace(const gchar *config_dir)
+static gboolean tm_create_workspace()
 {
    workspace_class_id = tm_work_object_register(tm_workspace_free, tm_workspace_update
    	  , tm_workspace_find_object);
@@ -79,12 +79,10 @@
    }
 }
-const TMWorkspace *tm_get_workspace(const gchar *config_dir)
+const TMWorkspace *tm_get_workspace()
 {
-	if (NULL == config_dir)
-		return NULL;
    if (NULL == theWorkspace)
-		tm_create_workspace(config_dir);
+		tm_create_workspace();
    return theWorkspace;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

    