SF.net SVN: geany:[3249] trunk/src

[eht16 at users.sourceforge.net]

Revision: 3249
          http://geany.svn.sourceforge.net/geany/?rev=3249&view=rev
Author:   eht16
Date:     2008-11-18 20:13:50 +0000 (Tue, 18 Nov 2008)

Log Message:
-----------
Fix empty tab labels for new files and cleanup.

Modified Paths:
--------------
    trunk/src/document.c
    trunk/src/notebook.c

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2008-11-18 20:13:29 UTC (rev 3248)
+++ trunk/src/document.c	2008-11-18 20:13:50 UTC (rev 3249)
@@ -277,17 +277,22 @@
 
 void document_update_tab_label(GeanyDocument *doc)
 {
-	gchar *base_name = g_path_get_basename(doc->file_name);
-	GtkWidget *parent = gtk_widget_get_parent(doc->priv->tab_label);
+	gchar *base_name;
+	GtkWidget *parent;
 	static GtkTooltips *tooltips = NULL;
 
+	g_return_if_fail(doc != NULL);
+
+	base_name = g_path_get_basename(DOC_FILENAME(doc));
+	parent = gtk_widget_get_parent(doc->priv->tab_label);
+
 	if (tooltips == NULL)
 		tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips"));
 
 	gtk_label_set_text(GTK_LABEL(doc->priv->tab_label), base_name);
 	gtk_label_set_text(GTK_LABEL(doc->priv->tabmenu_label), base_name);
 
-	gtk_tooltips_set_tip(tooltips, parent, doc->file_name, NULL);
+	gtk_tooltips_set_tip(tooltips, parent, DOC_FILENAME(doc), NULL);
 
 	g_free(base_name);
 }

Modified: trunk/src/notebook.c
===================================================================
--- trunk/src/notebook.c	2008-11-18 20:13:29 UTC (rev 3248)
+++ trunk/src/notebook.c	2008-11-18 20:13:50 UTC (rev 3249)
@@ -442,13 +442,11 @@
 {
 	GtkWidget *hbox, *ebox;
 	gint tabnum;
-	gchar *title;
 	GtkWidget *page;
 
 	g_return_val_if_fail(this != NULL, -1);
 
 	page = GTK_WIDGET(this->editor->sci);
-	title = g_path_get_basename(DOC_FILENAME(this));
 
 	this->priv->tab_label = gtk_label_new(NULL);
 
@@ -511,7 +509,6 @@
 		gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(main_widgets.notebook), page, TRUE);
 	}
 #endif
-	g_free(title);
 	return tabnum;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.