GNOME.org
 

anjuta r4691 - in trunk: . libanjuta plugins/build-basic-autotools plugins/file-manager plugins/gdb plugins/glade

Author: jhs
Date: Tue Feb  3 11:57:45 2009
New Revision: 4691
URL: http://svn.gnome.org/viewvc/anjuta?rev=4691&view=rev

Log:
2009-02-03  Johannes Schmid  <jhs gnome org>

	* configure.in:
	* plugins/glade/anjuta-design-document.c (ifile_get_file),
	(ifile_savable_save), (ifile_savable_save_as),
	(ifile_savable_is_dirty), (idocument_can_redo),
	(idocument_can_undo), (idocument_get_filename):
	* plugins/glade/plugin.c (on_glade_project_changed),
	(glade_plugin_add_project), (activate_plugin),
	(glade_get_filename), (ifile_open), (ifile_get_file),
	(iwizard_activate):
	* plugins/glade/plugin.h:

	#570249 â glade plugin does not build
	
	* plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin
	.ui:
	#566702 â Please add a separator between Build Project and Build Tarrbal
	
	* plugins/gdb/debugger.c (debugger_attach_process),
	(debugger_set_frame_finish), (debugger_set_frame):
	* plugins/gdb/debugger.h:
	Fixed 64-bit warnings
	
	* libanjuta/anjuta-utils.c (anjuta_util_from_file_to_file):
	Fix warnings
	
	* libanjuta/anjuta-vcs-status.h:
	* plugins/file-manager/file-view.c (get_status_string),
	(file_view_show_extended_data):
	570264 â cannot do subversion->commit: no modified files are detected anymore

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libanjuta/anjuta-vcs-status.h
   trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
   trunk/plugins/file-manager/file-view.c
   trunk/plugins/gdb/debugger.c
   trunk/plugins/gdb/debugger.h
   trunk/plugins/glade/anjuta-design-document.c
   trunk/plugins/glade/plugin.c
   trunk/plugins/glade/plugin.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Feb  3 11:57:45 2009
@@ -61,7 +61,6 @@
 AC_SUBST(LIBDEVHELP_REQUIRED)
 AC_SUBST(GDL_REQUIRED)
 AC_SUBST(GLADEUI_REQUIRED)
-AC_SUBST(GLADEUI_SVN_REQUIRED)
 AC_SUBST(LIBGRAPHVIZ_REQUIRED)
 AC_SUBST(NEON_REQUIRED)
 AC_SUBST(SUBVERSION_REQUIRED)
@@ -240,32 +239,19 @@
 AC_MSG_CHECKING(if glade plugin is disabled)
 if test "$user_disabled_glade" = 1; then
 	AC_MSG_RESULT(yes)
-	libgladeui_found="no"
+	gladeui_found="no"
 else
 	AC_MSG_RESULT(no)
-	AC_PATH_PROG(PKG_PATH, pkg-config, no)
 	gladeui_version=0
-	PKG_CHECK_MODULES(PLUGIN_GLADE, gladeui-1.0,
+	PKG_CHECK_MODULES(PLUGIN_GLADE, gladeui-1.0 >= $GLADEUI_REQUIRED,
 	    [
-		libgladeui_found="yes"
-		gladeui_version=`$PKG_PATH --modversion gladeui-1.0 | sed -e 's,\.,,g'`
+		gladeui_found=yes
 	    ], [
-		libgladeui_found="no"
+		gladeui_found=no
 	    ])
-	if test x$libgladeui_found = xno; then
-	    PKG_CHECK_MODULES(PLUGIN_GLADE, [libgladeui-1.0 >= $GLADEUI_REQUIRED],
-		[
-			libgladeui_found="yes"
-			gladeui_version=`$PKG_PATH --modversion libgladeui-1.0 | sed -e 's,\.,,g'`
-		], [
-			libgladeui_found="no"
-		])
-	fi
-	AC_DEFINE_UNQUOTED(GLADEUI_VERSION, [$gladeui_version], [GLADEUI version])
-	AC_SUBST(GLADEUI_VERSION)
 fi
 
-AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$libgladeui_found = xyes])
+AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$gladeui_found = xyes])
 
 dnl Check for graphviz (class inheritance and profiler plugins)
 dnl --------------------------------------------------------------------------
@@ -1060,11 +1046,11 @@
 		echo "        Requires subversion (>= 1.5); http://subversion.org";
 fi
 
-if [ test x$libgladeui_found = xyes ]; then
+if [ test x$gladeui_found = xyes ]; then
        echo "Building glade plugin: .................................YES"
 else
        echo "Building glade plugin: .................................NO"
-       echo "        Requires glade-3 (>= 3.0.2)"
+       echo "        Requires glade-3 (>= $GLADEUI_REQUIRED)"
 fi
 
 if [ test x$devhelp_enabled = xyes ]; then

Modified: trunk/libanjuta/anjuta-vcs-status.h
==============================================================================
--- trunk/libanjuta/anjuta-vcs-status.h	(original)
+++ trunk/libanjuta/anjuta-vcs-status.h	Tue Feb  3 11:57:45 2009
@@ -36,15 +36,15 @@
 {
 	/* Unversioned, ignored, or uninteresting items */
 	ANJUTA_VCS_STATUS_NONE = 0, /*< skip >*/
-	ANJUTA_VCS_STATUS_MODIFIED,
-	ANJUTA_VCS_STATUS_ADDED,
-	ANJUTA_VCS_STATUS_DELETED,
-	ANJUTA_VCS_STATUS_CONFLICTED,
-	ANJUTA_VCS_STATUS_UPTODATE,
-	ANJUTA_VCS_STATUS_LOCKED,
-	ANJUTA_VCS_STATUS_MISSING,
-	ANJUTA_VCS_STATUS_UNVERSIONED,
-	ANJUTA_VCS_STATUS_IGNORED
+	ANJUTA_VCS_STATUS_MODIFIED = 1 << 0,
+	ANJUTA_VCS_STATUS_ADDED = 1 << 1,
+	ANJUTA_VCS_STATUS_DELETED = 1 << 2,
+	ANJUTA_VCS_STATUS_CONFLICTED = 1 << 3,
+	ANJUTA_VCS_STATUS_UPTODATE = 1 << 4,
+	ANJUTA_VCS_STATUS_LOCKED = 1 << 5,
+	ANJUTA_VCS_STATUS_MISSING = 1 << 6,
+	ANJUTA_VCS_STATUS_UNVERSIONED = 1 << 7,
+	ANJUTA_VCS_STATUS_IGNORED = 1 << 8
 } AnjutaVcsStatus;
 
 #endif // ANJUTA_VCS_STATUS_H

Modified: trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
==============================================================================
--- trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui	(original)
+++ trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui	Tue Feb  3 11:57:45 2009
@@ -6,7 +6,6 @@
 				<menuitem name="CompileFile" action="ActionBuildCompileFile"/>
 				<menuitem name="BuildModule" action="ActionBuildBuildModule"/>
 				<menuitem name="BuildProject" action="ActionBuildBuildProject"/>
-				<menuitem name="BuildDistribution" action="ActionBuildDistribution"/>
 				<separator name="separator10"/>
 				<menuitem name="InstallModule" action="ActionBuildInstallModule"/>
 				<menuitem name="InstallProject" action="ActionBuildInstallProject"/>
@@ -18,6 +17,7 @@
 				<menuitem name="SelectConfiguration" action="ActionBuildSelectConfiguration"/>
 				<menuitem name="RemoveConfiguration" action="ActionBuildRemoveConfiguration"/>
 				<separator name="separator13"/>
+				<menuitem name="BuildDistribution" action="ActionBuildDistribution"/>
 			</menu>
 		</placeholder>
 	</menubar>

Modified: trunk/plugins/file-manager/file-view.c
==============================================================================
--- trunk/plugins/file-manager/file-view.c	(original)
+++ trunk/plugins/file-manager/file-view.c	Tue Feb  3 11:57:45 2009
@@ -54,18 +54,35 @@
 
 G_DEFINE_TYPE (AnjutaFileView, file_view, GTK_TYPE_TREE_VIEW);
 
-const gchar* anjuta_vcs_status_strings[] = {
-	NULL,
-	N_("Modified"),
-	N_("Added"),
-	N_("Deleted"),
-	N_("Conflicted"),
-	N_("Up-to-date"),
-	N_("Locked"),
-	N_("Missing"),
-	N_("Unversioned"),
-	N_("Ignored")	
-};
+static const gchar*
+get_status_string(AnjutaVcsStatus status)
+{
+	switch (status)
+	{
+		case ANJUTA_VCS_STATUS_NONE:
+			return NULL;
+		case ANJUTA_VCS_STATUS_MODIFIED:
+			return _("Modified");
+		case ANJUTA_VCS_STATUS_DELETED:
+			return _("Deleted");
+		case ANJUTA_VCS_STATUS_ADDED:
+			return _("Added");
+		case ANJUTA_VCS_STATUS_CONFLICTED:
+			return _("Conflicted");
+		case ANJUTA_VCS_STATUS_UPTODATE:
+			return _("Up-to-date");
+		case ANJUTA_VCS_STATUS_LOCKED:
+			return _("Locked");
+		case ANJUTA_VCS_STATUS_MISSING:
+			return _("Missing");
+		case ANJUTA_VCS_STATUS_UNVERSIONED:
+			return _("Unversioned");
+		case ANJUTA_VCS_STATUS_IGNORED:
+			return _("Ignored");
+		default:
+			g_assert_not_reached();
+	}		
+}
 
 enum
 {
@@ -285,14 +302,14 @@
 									   NULL, NULL);
 		time = g_file_info_get_attribute_uint64(file_info, "time::changed");
 		strftime(time_str, 127, "%x %X", localtime(&time));
-		if (anjuta_vcs_status_strings[status])
+		if (get_status_string(status))
 		{
 			display = g_markup_printf_escaped("%s\n"
 											  "<small><tt>%s</tt></small>\n"
 											  "<small>%s</small>",
 											  g_file_info_get_display_name(file_info),
 											  time_str,
-											  anjuta_vcs_status_strings[status]);
+											  get_status_string(status));
 		}
 		else
 		{

Modified: trunk/plugins/gdb/debugger.c
==============================================================================
--- trunk/plugins/gdb/debugger.c	(original)
+++ trunk/plugins/gdb/debugger.c	Tue Feb  3 11:57:45 2009
@@ -1993,7 +1993,7 @@
 		dialog = gtk_message_dialog_new (debugger->priv->parent_win,
 										 GTK_DIALOG_DESTROY_WITH_PARENT,
 										 GTK_MESSAGE_QUESTION,
-										 GTK_BUTTONS_YES_NO, mesg);
+										 GTK_BUTTONS_YES_NO, "%s", mesg);
 		if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
 		{
 			debugger_stop_program (debugger);
@@ -3523,14 +3523,14 @@
 debugger_set_frame_finish (Debugger *debugger, const GDBMIValue *mi_results, const GList *cli_results, GError *error)
 
 {
-	guint frame  = (guint)debugger->priv->current_cmd.user_data;
+	gsize frame  = (gsize)debugger->priv->current_cmd.user_data;
 	debugger->priv->current_frame = frame;
 	
 	g_signal_emit_by_name (debugger->priv->instance, "frame-changed", frame, debugger->priv->current_thread);
 }
 
 void
-debugger_set_frame (Debugger *debugger, guint frame)
+debugger_set_frame (Debugger *debugger, gsize frame)
 {
 	gchar *buff;
 	
@@ -3538,7 +3538,7 @@
 
 	g_return_if_fail (IS_DEBUGGER (debugger));
 
-	buff = g_strdup_printf ("-stack-select-frame %d", frame);
+	buff = g_strdup_printf ("-stack-select-frame %u", frame);
 
 	debugger_queue_command (debugger, buff, FALSE, FALSE, (DebuggerParserFunc)debugger_set_frame_finish, NULL, (gpointer)frame);
 	g_free (buff);

Modified: trunk/plugins/gdb/debugger.h
==============================================================================
--- trunk/plugins/gdb/debugger.h	(original)
+++ trunk/plugins/gdb/debugger.h	Tue Feb  3 11:57:45 2009
@@ -163,7 +163,7 @@
 /* Stack */
 void debugger_list_argument (Debugger *debugger, IAnjutaDebuggerCallback func, gpointer user_data);
 void debugger_list_frame (Debugger *debugger, IAnjutaDebuggerCallback func, gpointer user_data);
-void debugger_set_frame (Debugger *debugger, guint frame);
+void debugger_set_frame (Debugger *debugger, gsize frame);
 
 /* Thread */
 void debugger_list_thread (Debugger *debugger, IAnjutaDebuggerCallback func, gpointer user_data);

Modified: trunk/plugins/glade/anjuta-design-document.c
==============================================================================
--- trunk/plugins/glade/anjuta-design-document.c	(original)
+++ trunk/plugins/glade/anjuta-design-document.c	Tue Feb  3 11:57:45 2009
@@ -338,18 +338,11 @@
 
 	GladeProject* project = glade_design_view_get_project(priv->design_view);
 
-#if (GLADEUI_VERSION >= 330)
 	const gchar* path = glade_project_get_path(project);
 	if (path != NULL)
 		return g_file_new_for_path (path);
 	else
 		return NULL;
-#else
-	if (project && project->path)
-		return g_file_new_for_path (project->path);
-	else
-		return NULL;
-#endif
 }
 
 
@@ -367,42 +360,28 @@
 	
 	GladeProject* project = glade_design_view_get_project(priv->design_view);
 	
-#if (GLADEUI_VERSION >= 330)
 	if (glade_project_get_path(project) != NULL) 
 	{
-#else
-		if (project && project->path != NULL) 
+		AnjutaStatus *status;
+		
+		status = anjuta_shell_get_status (ANJUTA_PLUGIN(priv->glade_plugin)->shell, NULL);
+		if (glade_project_save (project, glade_project_get_path(project),
+								NULL)) 
+		{
+			anjuta_status_set (status, _("Glade project '%s' saved"),
+							   glade_project_get_name(project));
+			g_signal_emit_by_name(G_OBJECT(self), "update-save-ui");
+			g_signal_emit_by_name(G_OBJECT(self), "saved", file);
+		}
+		else
 		{
-#endif
-			AnjutaStatus *status;
-			
-			status = anjuta_shell_get_status (ANJUTA_PLUGIN(priv->glade_plugin)->shell, NULL);
-			
-#if (GLADEUI_VERSION >= 330)
-			if (glade_project_save (project, glade_project_get_path(project),
-									NULL)) 
-			{
-				anjuta_status_set (status, _("Glade project '%s' saved"),
-								   glade_project_get_name(project));
-#else
-				if (glade_project_save (project, project->path, NULL)) 
-				{
-					GFile* file = g_file_new_for_path(project->path);
-					anjuta_status_set (status, _("Glade project '%s' saved"),
-									   project->name);
-#endif
-					g_signal_emit_by_name(G_OBJECT(self), "update-save-ui");
-					g_signal_emit_by_name(G_OBJECT(self), "saved", file);
-				}
-				else
-				{
-					anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(priv->glade_plugin)->shell),
-												_("Invalid glade file name"));
-					g_signal_emit_by_name(G_OBJECT(self), "saved", NULL);
-				}
-				return;
-			}
-			DEBUG_PRINT("%s", "Invalid use of ifile_savable_save!");
+			anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN(priv->glade_plugin)->shell),
+										_("Invalid glade file name"));
+			g_signal_emit_by_name(G_OBJECT(self), "saved", NULL);
+		}
+		return;
+	}
+	DEBUG_PRINT("%s", "Invalid use of ifile_savable_save!");
 }
 
 static void ifile_savable_save_as(IAnjutaFileSavable* ifile, GFile* file, GError **e)
@@ -414,18 +393,11 @@
 
 	AnjutaStatus *status = anjuta_shell_get_status (ANJUTA_PLUGIN(priv->glade_plugin)->shell, NULL);
 
-#if (GLADEUI_VERSION >= 330)
 	if (glade_project_save (project, g_file_get_path (file),
 								NULL))
 	{
 		anjuta_status_set (status, _("Glade project '%s' saved"),
 							   glade_project_get_name(project));
-#else
-	if (glade_project_save (project, g_file_get_path (file), NULL))
-	{
-		anjuta_status_set (status, _("Glade project '%s' saved"),
-							   project->name);
-#endif
 	g_signal_emit_by_name(G_OBJECT(self), "update-save-ui");
 	}
 	else
@@ -449,15 +421,7 @@
 	GladeProject* project = glade_design_view_get_project(priv->design_view);
 	if (project == NULL)
 		return FALSE;
-#if (GLADEUI_VERSION >= 330)
-#  if (GLADEUI_VERSION >= 331)
 	if (glade_project_get_modified (project))
-#  else
- 	if (glade_project_get_has_unsaved_changes (project))
-#  endif
-#else
-	if (project->changed)
-#endif
 	{
 		return TRUE;
 	}
@@ -497,12 +461,7 @@
 {
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(editor);
 	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-#if (GLADEUI_VERSION >= 330)
 	GladeCommand *redo_item;
-#else
-	GList *prev_redo_item;
-	GList *redo_item;
-#endif
 	const gchar *redo_description = NULL;
 
 	GladeProject* project = glade_design_view_get_project(priv->design_view);
@@ -512,16 +471,9 @@
 	}
 	else
 	{
-#if (GLADEUI_VERSION >= 330)
 		redo_item = glade_project_next_redo_item(project);
 		if (redo_item)
 			redo_description = redo_item->description;
-#else
-		prev_redo_item = project->prev_redo_item;
-		redo_item = (prev_redo_item == NULL) ? project->undo_stack : prev_redo_item->next;
-		if (redo_item && redo_item->data)
-			redo_description = GLADE_COMMAND (redo_item->data)->description;
-#endif
 	}
 	return (redo_description != NULL);
 }
@@ -531,12 +483,7 @@
 {
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(editor);
 	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
-#if (GLADEUI_VERSION >= 330)
 	GladeCommand *undo_item;
-#else
-	GList *prev_redo_item;
-	GList *undo_item;
-#endif
 	const gchar *undo_description = NULL;
 	GladeProject* project = glade_design_view_get_project(priv->design_view);
 	if (!project)
@@ -545,15 +492,9 @@
 	}
 	else
 	{
-#if (GLADEUI_VERSION >= 330)
 		undo_item = glade_project_next_undo_item(project);
 		if (undo_item)
 			undo_description = undo_item->description;
-#else
-		undo_item = prev_redo_item = project->prev_redo_item;
-		if (undo_item && undo_item->data)
-			undo_description = GLADE_COMMAND (undo_item->data)->description;
-#endif
 	}
 	return (undo_description != NULL);
 }
@@ -595,14 +536,7 @@
 	AnjutaDesignDocument* self = ANJUTA_DESIGN_DOCUMENT(editor);
 	AnjutaDesignDocumentPrivate* priv = ADD_GET_PRIVATE(self);
 	GladeProject* project = glade_design_view_get_project(priv->design_view);
-	#if (GLADEUI_VERSION >= 330)
-		return glade_project_get_name(project);
-	#else
-		if (project)
-			return project->name;
-		else
-			return "Glade";
-	#endif
+	return glade_project_get_name(project);
 }
 
 static void

Modified: trunk/plugins/glade/plugin.c
==============================================================================
--- trunk/plugins/glade/plugin.c	(original)
+++ trunk/plugins/glade/plugin.c	Tue Feb  3 11:57:45 2009
@@ -555,9 +555,7 @@
 			ianjuta_document_manager_set_current_document(docman, IANJUTA_DOCUMENT(design_document), NULL);
 		}
 
-#  if (GLADEUI_VERSION >= 330)
         glade_inspector_set_project (GLADE_INSPECTOR (plugin->priv->inspector), project);
-#  endif
 
 	}
 }
@@ -1084,7 +1082,6 @@
 	glade_plugin_load_associations (plugin);
 }
 
-#if (GLADEUI_VERSION >= 330)
 static void
 inspector_item_activated_cb (GladeInspector     *inspector,
 							 AnjutaPlugin       *plugin)
@@ -1140,8 +1137,6 @@
 	g_free (glade_basename);
 }
 
-#endif
-
 
 
 
@@ -3829,12 +3824,10 @@
 	                        G_CALLBACK (on_glade_designer_widget_event_after), glade_plugin);
 #endif
 
-#if (GLADEUI_VERSION >= 330)
 	g_signal_connect (G_OBJECT (project), "resource-added",
 	                  G_CALLBACK (on_glade_resource_added), glade_plugin);
 	g_signal_connect (G_OBJECT (project), "resource-removed",
 	                  G_CALLBACK (on_glade_resource_removed), glade_plugin);
-#endif
 }
 
 static void
@@ -4320,22 +4313,12 @@
 		gtk_box_pack_start (GTK_BOX (priv->view_box), priv->projects_combo,
 							FALSE, FALSE, 0);
 
-#if (GLADEUI_VERSION >= 330)
         priv->inspector = glade_inspector_new ();
 
         g_signal_connect (priv->inspector, "item-activated",
         				  G_CALLBACK (inspector_item_activated_cb),
         				  plugin);
-#else
-		priv->inspector = glade_project_view_new ();
-#endif
-
-#if (GLADEUI_VERSION < 330)
-		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->inspector),
-										GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-		glade_app_add_project_view (GLADE_PROJECT_VIEW (priv->inspector));
-#endif
 		gtk_box_pack_start (GTK_BOX (priv->view_box), GTK_WIDGET (priv->inspector),
 							TRUE, TRUE, 0);
 
@@ -4657,15 +4640,7 @@
 
 gchar* glade_get_filename(GladePlugin *plugin)
 {
-#if (GLADEUI_VERSION >= 330)
 	return glade_project_get_name(glade_app_get_project());
-#else
-	GladeProject* project = glade_app_get_project();
-	if (project)
-		return project->name;
-	else
-		return NULL;
-#endif
 }
 
 static void
@@ -4703,11 +4678,7 @@
 		return;
 	}
 
-#if (GLADEUI_VERSION >= 330)
 	project = glade_project_load (filename);
-#else
-	project = glade_project_open (filename);
-#endif
 	g_free (filename);
 	if (!project)
 	{
@@ -4717,11 +4688,8 @@
 		g_free (name);
 		return;
 	}
-#if (GLADEUI_VERSION >= 330)
 	project_name = glade_project_get_name(project);
-#else
-	project_name = project->name;
-#endif
+
 	glade_plugin_add_project (ANJUTA_PLUGIN_GLADE (ifile), project, project_name);
 
 	/* Select the first window in the project */
@@ -4742,17 +4710,9 @@
 static GFile*
 ifile_get_file (IAnjutaFile* ifile, GError** e)
 {
-#if (GLADEUI_VERSION >= 330)
 	const gchar* path = glade_project_get_path(glade_app_get_project());
 	GFile* file = g_file_new_for_path (path);
 	return file;
-#else
-	GladeProject* project = glade_app_get_project();
-	if (project && project->path)
-		return g_file_new_for_path(project->path);
-	else
-		return NULL;
-#endif
 }
 
 static void
@@ -4773,11 +4733,7 @@
 
 	priv = ANJUTA_PLUGIN_GLADE (iwizard)->priv;
 
-#if (GLADEUI_VERSION >= 330)
 	project = glade_project_new ();
-#else
-	project = glade_project_new (TRUE);
-#endif
 	if (!project)
 	{
 		anjuta_util_dialog_warning (GTK_WINDOW (ANJUTA_PLUGIN (iwizard)->shell),
@@ -4786,11 +4742,7 @@
 	}
 	store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (priv->projects_combo)));
 	gtk_list_store_append (store, &iter);
-#if (GLADEUI_VERSION >= 330)
 	project_name = glade_project_get_name(project);
-#else
-	project_name = project->name;
-#endif
 	glade_plugin_add_project (ANJUTA_PLUGIN_GLADE (iwizard), project, project_name);
 	anjuta_shell_present_widget (ANJUTA_PLUGIN (iwizard)->shell,
 				     GTK_WIDGET (glade_app_get_palette ()), NULL);

Modified: trunk/plugins/glade/plugin.h
==============================================================================
--- trunk/plugins/glade/plugin.h	(original)
+++ trunk/plugins/glade/plugin.h	Tue Feb  3 11:57:45 2009
@@ -25,17 +25,8 @@
 
 #include "config.h"
 
-#if (GLADEUI_VERSION <= 303)
-# include <glade.h>
-#else
-# if (GLADEUI_VERSION <= 314)
-#   include <glade.h>
-#   include <glade-design-view.h>
-# else /* Since 3.1.5 */
-#   include <gladeui/glade.h>
-#   include <gladeui/glade-design-view.h>
-# endif
-#endif
+#include <gladeui/glade.h>
+#include <gladeui/glade-design-view.h>
 
 extern GType glade_plugin_get_type (GTypeModule *module);
 #define ANJUTA_TYPE_PLUGIN_GLADE         (glade_plugin_get_type (NULL))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]