Commits June 2010

commits@lists.geany.org

5 participants
98 discussions

SF.net SVN: geany:[5035] branches/sm/src/sm.c
by statc＠users.sourceforge.net 17 Jun '10

17 Jun '10

Revision: 5035 http://geany.svn.sourceforge.net/geany/?rev=5035&view=rev Author: statc Date: 2010-06-17 14:52:47 +0000 (Thu, 17 Jun 2010) Log Message: ----------- Minor code style improvements Modified Paths: -------------- branches/sm/src/sm.c Modified: branches/sm/src/sm.c =================================================================== --- branches/sm/src/sm.c 2010-06-17 14:52:29 UTC (rev 5034) +++ branches/sm/src/sm.c 2010-06-17 14:52:47 UTC (rev 5035) @@ -55,6 +55,7 @@ #include <X11/SM/SMlib.h> #include <X11/ICE/ICElib.h> +#include "sm.h" #include "geany.h" #include "main.h" /* for cl_options */ #include "ui_utils.h" /* access main_widgets.notebook to iterate over opened docs */ @@ -72,8 +73,8 @@ static void sm_set_constant_props(SmcConn smcon); static void sm_store_props(const char * argv0, const char * libsm_client_id); static void sm_set_runtime_props(SmcConn smcon); -static void sm_cmd_props(); -static void sm_files_props(); +static void sm_cmd_props(GArray * arr); +static void sm_files_props(GArray * arr); static void sm_save_yourself_callback(SmcConn smcon, SmPointer client_data, int save_type, Bool shutdown, int interact_style, Bool fast); @@ -134,11 +135,8 @@ char * new_client_id; /* This function should be called once */ - g_assert(!smc_conn); - if (smc_conn) - return; + g_return_if_fail(!smc_conn); - smc_conn = sm_connect(libsm_client_id, &new_client_id); if (!smc_conn) return; @@ -166,7 +164,7 @@ if (smc_conn) { SmcCloseConnection(smc_conn, 0, NULL); - smc_conn = 0; + smc_conn = NULL; } #endif } @@ -258,7 +256,7 @@ * it is no longer needed. If connection to the * session manager fails, the variable is filled * with @c NULL pointer. - * @return libSM connection object or @c 0 if connection to the session manager fails. + * @return libSM connection object or @c NULL if connection to the session manager fails. */ static SmcConn sm_connect(const char * libsm_client_id, char ** new_client_id) { @@ -272,7 +270,7 @@ SmcConn smcon; if (!g_getenv("SESSION_MANAGER")) - return 0; + return NULL; IceAddConnectionWatch(ice_connection_watch, NULL); @@ -289,9 +287,8 @@ if (!smcon) { g_warning("While connecting to session manager:\n%s.", err); - IceRemoveConnectionWatch(ice_connection_watch, NULL); - return 0; + return NULL; } return smcon; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5034] branches/sm/src
by statc＠users.sourceforge.net 17 Jun '10

17 Jun '10

Revision: 5034 http://geany.svn.sourceforge.net/geany/?rev=5034&view=rev Author: statc Date: 2010-06-17 14:52:29 +0000 (Thu, 17 Jun 2010) Log Message: ----------- Update copyright information Modified Paths: -------------- branches/sm/src/sm.c branches/sm/src/sm.h Modified: branches/sm/src/sm.c =================================================================== --- branches/sm/src/sm.c 2010-06-17 14:52:09 UTC (rev 5033) +++ branches/sm/src/sm.c 2010-06-17 14:52:29 UTC (rev 5034) @@ -1,7 +1,7 @@ /* * sm.c - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Eugene Arshinov <earshinov(at)gmail(dot)com> + * Copyright 2009-2010 Eugene Arshinov <earshinov(at)gmail(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/sm/src/sm.h =================================================================== --- branches/sm/src/sm.h 2010-06-17 14:52:09 UTC (rev 5033) +++ branches/sm/src/sm.h 2010-06-17 14:52:29 UTC (rev 5034) @@ -1,7 +1,7 @@ /* * sm.h - this file is part of Geany, a fast and lightweight IDE * - * Copyright 2009 Eugene Arshinov <earshinov(at)gmail(dot)com> + * Copyright 2009-2010 Eugene Arshinov <earshinov(at)gmail(dot)com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5033] branches/sm/src/sm.c
by statc＠users.sourceforge.net 17 Jun '10

17 Jun '10

Revision: 5033 http://geany.svn.sourceforge.net/geany/?rev=5033&view=rev Author: statc Date: 2010-06-17 14:52:09 +0000 (Thu, 17 Jun 2010) Log Message: ----------- Stupid fix to use gdk_set_sm_client_id() properly Modified Paths: -------------- branches/sm/src/sm.c Modified: branches/sm/src/sm.c =================================================================== --- branches/sm/src/sm.c 2010-06-17 14:51:49 UTC (rev 5032) +++ branches/sm/src/sm.c 2010-06-17 14:52:09 UTC (rev 5033) @@ -138,12 +138,13 @@ if (smc_conn) return; - gdk_set_sm_client_id(libsm_client_id); smc_conn = sm_connect(libsm_client_id, &new_client_id); if (!smc_conn) return; + gdk_set_sm_client_id(new_client_id); + sm_store_props(argv0, new_client_id); sm_set_constant_props(smc_conn); free(new_client_id); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5032] branches/sm/src
by statc＠users.sourceforge.net 17 Jun '10

17 Jun '10

Revision: 5032 http://geany.svn.sourceforge.net/geany/?rev=5032&view=rev Author: statc Date: 2010-06-17 14:51:49 +0000 (Thu, 17 Jun 2010) Log Message: ----------- Fix for r4972: properly save filetype config when filetype's build commands are changed Modified Paths: -------------- branches/sm/src/build.c branches/sm/src/filetypes.h Modified: branches/sm/src/build.c =================================================================== --- branches/sm/src/build.c 2010-06-17 12:35:17 UTC (rev 5031) +++ branches/sm/src/build.c 2010-06-17 14:51:49 UTC (rev 5032) @@ -2209,7 +2209,7 @@ } prefdsts.nonfileregexstr = &regex_pref; if (build_read_commands(&prefdsts, table_data, response) && ft != NULL) - ft->home_save_needed = TRUE; + filetypes_save_commands(ft); build_free_fields(table_data); build_menu_update(doc); @@ -2722,5 +2722,3 @@ /* set the submenu to the toolbar item */ geany_menu_button_action_set_menu(GEANY_MENU_BUTTON_ACTION(widgets.build_action), toolmenu); } - - Modified: branches/sm/src/filetypes.h =================================================================== --- branches/sm/src/filetypes.h 2010-06-17 12:35:17 UTC (rev 5031) +++ branches/sm/src/filetypes.h 2010-06-17 14:51:49 UTC (rev 5032) @@ -139,7 +139,6 @@ gint project_list_entry; gchar *projerror_regex_string; gchar *homeerror_regex_string; - gboolean home_save_needed; #endif }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5031] trunk
by ntrel＠users.sourceforge.net 17 Jun '10

17 Jun '10

Revision: 5031 http://geany.svn.sourceforge.net/geany/?rev=5031&view=rev Author: ntrel Date: 2010-06-17 12:35:17 +0000 (Thu, 17 Jun 2010) Log Message: ----------- Display 'new instance' on title bar (patch by Eugene Arshinov, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-17 12:14:48 UTC (rev 5030) +++ trunk/ChangeLog 2010-06-17 12:35:17 UTC (rev 5031) @@ -6,6 +6,9 @@ * src/build.c: Make default Build dialog entries grey, not light grey (too hard to read on a white background). + * src/ui_utils.c: + Display 'new instance' on title bar (patch by Eugene Arshinov, + thanks). 2010-06-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2010-06-17 12:14:48 UTC (rev 5030) +++ trunk/src/ui_utils.c 2010-06-17 12:35:17 UTC (rev 5031) @@ -51,6 +51,7 @@ #include "symbols.h" #include "toolbar.h" #include "geanymenubuttonaction.h" +#include "main.h" GeanyInterfacePrefs interface_prefs; @@ -290,6 +291,10 @@ g_string_append(str, "] - "); } g_string_append(str, "Geany"); + if (cl_options.new_instance) + { + g_string_append(str, _(" (new instance)")); + } gtk_window_set_title(GTK_WINDOW(main_widgets.window), str->str); g_string_free(str, TRUE); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5030] trunk/src/sidebar.c
by ntrel＠users.sourceforge.net 17 Jun '10

17 Jun '10

Revision: 5030 http://geany.svn.sourceforge.net/geany/?rev=5030&view=rev Author: ntrel Date: 2010-06-17 12:14:48 +0000 (Thu, 17 Jun 2010) Log Message: ----------- Refactor get_doc_parent(). Modified Paths: -------------- trunk/src/sidebar.c Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2010-06-17 12:12:37 UTC (rev 5029) +++ trunk/src/sidebar.c 2010-06-17 12:14:48 UTC (rev 5030) @@ -340,22 +340,19 @@ } -static GtkTreeIter *get_doc_parent(GeanyDocument *doc) +static gchar *get_doc_folder(GeanyDocument *doc) { gchar *tmp_dirname; gchar *project_base_path; gchar *dirname = NULL; const gchar *home_dir = g_get_home_dir(); - static GtkTreeIter parent; - GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); const gchar *rest; - if (!documents_show_paths) - return NULL; + tmp_dirname = g_path_get_dirname(DOC_FILENAME(doc)); - tmp_dirname = g_path_get_dirname(DOC_FILENAME(doc)); /* replace the project base path with the project name */ project_base_path = project_get_base_path(); + if (project_base_path != NULL) { gsize len = strlen(project_base_path); @@ -392,6 +389,21 @@ else g_free(tmp_dirname); + return dirname; +} + + +static GtkTreeIter *get_doc_parent(GeanyDocument *doc) +{ + gchar *dirname = NULL; + static GtkTreeIter parent; + GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); + + if (!documents_show_paths) + return NULL; + + dirname = get_doc_folder(doc); + if (gtk_tree_model_get_iter_first(model, &parent)) { do This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5029] trunk
by ntrel＠users.sourceforge.net 17 Jun '10

17 Jun '10

Revision: 5029 http://geany.svn.sourceforge.net/geany/?rev=5029&view=rev Author: ntrel Date: 2010-06-17 12:12:37 +0000 (Thu, 17 Jun 2010) Log Message: ----------- Make default Build dialog entries grey, not light grey (too hard to read on a white background). Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-17 12:03:00 UTC (rev 5028) +++ trunk/ChangeLog 2010-06-17 12:12:37 UTC (rev 5029) @@ -3,6 +3,9 @@ * src/sidebar.c: Replace /home/user with ~ in the documents list (patch by Jon Strait, thanks). + * src/build.c: + Make default Build dialog entries grey, not light grey (too hard to + read on a white background). 2010-06-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2010-06-17 12:03:00 UTC (rev 5028) +++ trunk/src/build.c 2010-06-17 12:12:37 UTC (rev 5029) @@ -1776,7 +1776,7 @@ } } r->used_dst = FALSE; - gdk_color_parse("light grey", &color); + gdk_color_parse("grey", &color); set_row_color(r, &color); r->cleared = TRUE; } @@ -1892,7 +1892,7 @@ } set_build_command_entry_text(roww->entries[i], str); } - gdk_color_parse("light grey", &color); + gdk_color_parse("grey", &color); if (bc != NULL && ((gint)dst > src)) set_row_color(roww, &color); if (bc != NULL && (src > (gint)dst || (grp == GEANY_GBG_FT && (doc == NULL || doc->file_type == NULL)))) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5028] trunk
by ntrel＠users.sourceforge.net 17 Jun '10

17 Jun '10

Revision: 5028 http://geany.svn.sourceforge.net/geany/?rev=5028&view=rev Author: ntrel Date: 2010-06-17 12:03:00 +0000 (Thu, 17 Jun 2010) Log Message: ----------- Replace /home/user with ~ in the documents list (patch by Jon Strait, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/sidebar.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-16 15:26:04 UTC (rev 5027) +++ trunk/ChangeLog 2010-06-17 12:03:00 UTC (rev 5028) @@ -1,3 +1,10 @@ +2010-06-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/sidebar.c: + Replace /home/user with ~ in the documents list (patch by Jon + Strait, thanks). + + 2010-06-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/notebook.c: Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2010-06-16 15:26:04 UTC (rev 5027) +++ trunk/src/sidebar.c 2010-06-17 12:03:00 UTC (rev 5028) @@ -345,8 +345,10 @@ gchar *tmp_dirname; gchar *project_base_path; gchar *dirname = NULL; + const gchar *home_dir = g_get_home_dir(); static GtkTreeIter parent; GtkTreeModel *model = GTK_TREE_MODEL(store_openfiles); + const gchar *rest; if (!documents_show_paths) return NULL; @@ -357,7 +359,6 @@ if (project_base_path != NULL) { gsize len = strlen(project_base_path); - const gchar *rest; if (project_base_path[len-1] == G_DIR_SEPARATOR) project_base_path[len-1] = '\0'; @@ -367,12 +368,27 @@ { rest = tmp_dirname + len; if (*rest == G_DIR_SEPARATOR || *rest == '\0') + { dirname = g_strdup_printf("%s%s", app->project->name, rest); + } } g_free(project_base_path); } if (dirname == NULL) + { dirname = tmp_dirname; + + /* If matches home dir, replace with tilde */ + if (home_dir && *home_dir != 0 && g_str_has_prefix(dirname, home_dir)) + { + rest = dirname + strlen(home_dir); + if (*rest == G_DIR_SEPARATOR || *rest == '\0') + { + dirname = g_strdup_printf("~%s", rest); + g_free(tmp_dirname); + } + } + } else g_free(tmp_dirname); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5027] trunk/src/templates.c
by ntrel＠users.sourceforge.net 16 Jun '10

16 Jun '10

Revision: 5027 http://geany.svn.sourceforge.net/geany/?rev=5027&view=rev Author: ntrel Date: 2010-06-16 15:26:04 +0000 (Wed, 16 Jun 2010) Log Message: ----------- Remove template strings (not sure why gcc doesn't warn about unused static data?). Modified Paths: -------------- trunk/src/templates.c Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2010-06-16 15:22:56 UTC (rev 5026) +++ trunk/src/templates.c 2010-06-16 15:26:04 UTC (rev 5027) @@ -46,75 +46,7 @@ static GtkWidget *new_with_template_menu = NULL; /* submenu used for both file menu and toolbar */ - -/* TODO: implement custom insertion templates, put these into files in data/templates */ - -/* default templates, only for initial tempate file creation on first start of Geany */ -static const gchar templates_gpl_notice[] = "\ -This program is free software; you can redistribute it and/or modify\n\ -it under the terms of the GNU General Public License as published by\n\ -the Free Software Foundation; either version 2 of the License, or\n\ -(at your option) any later version.\n\ -\n\ -This program is distributed in the hope that it will be useful,\n\ -but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ -GNU General Public License for more details.\n\ -\n\ -You should have received a copy of the GNU General Public License\n\ -along with this program; if not, write to the Free Software\n\ -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n\ -MA 02110-1301, USA.\n\ -"; - -static const gchar templates_bsd_notice[] = "\ -Redistribution and use in source and binary forms, with or without\n\ -modification, are permitted provided that the following conditions are\n\ -met:\n\ -\n\ -* Redistributions of source code must retain the above copyright\n\ - notice, this list of conditions and the following disclaimer.\n\ -* Redistributions in binary form must reproduce the above\n\ - copyright notice, this list of conditions and the following disclaimer\n\ - in the documentation and/or other materials provided with the\n\ - distribution.\n\ -* Neither the name of the {company} nor the names of its\n\ - contributors may be used to endorse or promote products derived from\n\ - this software without specific prior written permission.\n\ -\n\ -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\ -\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n\ -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n\ -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n\ -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n\ -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n\ -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n\ -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n\ -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n\ -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n\ -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\ -"; - -static const gchar templates_function_description[] = "\ -\n\ -name: {functionname}\n\ -@param\n\ -@return\n\ -"; - -static const gchar templates_fileheader[] = "\ -{filename}\n\ -\n\ -Copyright {year} {developer} <{mail}>\n\ -\n\ -{gpl}\ -"; - -static const gchar templates_changelog[] = "\ -{date} {developer} <{mail}>\n\ -\n\ - * \n\n\n"; - +/* TODO: implement custom insertion templates instead? */ static gchar *templates[GEANY_MAX_TEMPLATES]; /* We should probably remove filetype templates support soon - users can use custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5026] branches/unstable/
by ntrel＠users.sourceforge.net 16 Jun '10

16 Jun '10

Revision: 5026 http://geany.svn.sourceforge.net/geany/?rev=5026&view=rev Author: ntrel Date: 2010-06-16 15:22:56 +0000 (Wed, 16 Jun 2010) Log Message: ----------- Remove completed branch. Removed Paths: ------------- branches/unstable/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2010