Commits September 2012

commits@lists.geany.org

1 participants
74 discussions

Start a nNew thread

[geany/geany] 926744: Don't use pre-GObject types and macros
by Colomban Wendling 13 Sep '12

13 Sep '12

1 0

[geany/geany] 593fef: Don't access GtkWidget:parent directly
by Colomban Wendling 13 Sep '12

13 Sep '12

1 0

[geany/geany] 49f6eb: Don't use gtk_widget_hide_all(), deprecated in 2.24
by Colomban Wendling 13 Sep '12

13 Sep '12

1 0

[geany/geany] c7f699: Don't access GtkNotebook fields directly
by Colomban Wendling 13 Sep '12

13 Sep '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 13 Sep 2012 14:34:18 Commit: c7f699736148535253b92ec7f3dd256a905b53d9 https://github.com/geany/geany/commit/c7f699736148535253b92ec7f3dd256a905b5… Log Message: ----------- Don't access GtkNotebook fields directly Modified Paths: -------------- src/notebook.c Modified: src/notebook.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -312,7 +312,7 @@ static gboolean focus_sci(GtkWidget *widget, GdkEventButton *event, gpointer use static gboolean gtk_notebook_show_arrows(GtkNotebook *notebook) { - return notebook->scrollable; + return gtk_notebook_get_scrollable(notebook); #if 0 /* To get this working we would need to define at least the first two fields of * GtkNotebookPage since it is a private field. The better way would be to @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] 96afed: Don't access GtkFontSelectionDialog fields directly
by Colomban Wendling 13 Sep '12

13 Sep '12

1 0

[geany/geany] 72db3a: Don't use deprecated GtkObject
by Colomban Wendling 13 Sep '12

13 Sep '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 13 Sep 2012 14:34:18 Commit: 72db3a711e9748c1fbcdd4e4cccb64e4f956a916 https://github.com/geany/geany/commit/72db3a711e9748c1fbcdd4e4cccb64e4f956a… Log Message: ----------- Don't use deprecated GtkObject Modified Paths: -------------- src/stash.c Modified: src/stash.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1082,7 +1082,7 @@ void stash_tree_setup(GPtrArray *group_array, GtkTreeView *tree) GtkTreeModel *model; GtkCellRenderer *cell; GtkTreeViewColumn *column; - GtkObject *adjustment; + GtkAdjustment *adjustment; store = gtk_list_store_new(STASH_TREE_COUNT, G_TYPE_STRING, G_TYPE_POINTER); stash_tree_append_prefs(group_array, store, PREF_DISPLAY); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] faeeaf: Check the VTE library we're loading actually have all symbols we need
by Colomban Wendling 13 Sep '12

13 Sep '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 13 Sep 2012 14:34:18 Commit: faeeaf4bd2ab906441d266baf93b57a13864654a https://github.com/geany/geany/commit/faeeaf4bd2ab906441d266baf93b57a138646… Log Message: ----------- Check the VTE library we're loading actually have all symbols we need This prevents a crash if the VTE library we happen to load lacks a symbol we need, which can happen e.g. if the user passed an improper library to the --vte-lib command-line option or if the VTE library is loadable but broken. Modified Paths: -------------- src/vte.c Modified: src/vte.c 85 files changed, 55 insertions(+), 30 deletions(-) =================================================================== @@ -121,7 +121,7 @@ struct VteFunctions static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer user_data); static gboolean vte_keyrelease_cb(GtkWidget *widget, GdkEventKey *event, gpointer data); static gboolean vte_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data); -static void vte_register_symbols(GModule *module); +static gboolean vte_register_symbols(GModule *module); static void vte_popup_menu_clicked(GtkMenuItem *menuitem, gpointer user_data); static GtkWidget *vte_create_popup_menu(void); static void vte_commit_cb(VteTerminal *vte, gchar *arg1, guint arg2, gpointer user_data); @@ -216,9 +216,18 @@ void vte_init(void) } else { - vte_info.have_vte = TRUE; vf = g_new0(struct VteFunctions, 1); - vte_register_symbols(module); + if (vte_register_symbols(module)) + vte_info.have_vte = TRUE; + else + { + vte_info.have_vte = FALSE; + g_free(vf); + /* FIXME: is closing the module safe? see vte_close() and test on FreeBSD */ + /*g_module_close(module);*/ + module = NULL; + return; + } } create_vte(); @@ -406,35 +415,51 @@ static void vte_set_cursor_blink_mode(void) } -static void vte_register_symbols(GModule *mod) -{ - g_module_symbol(mod, "vte_terminal_new", (void*)&vf->vte_terminal_new); - g_module_symbol(mod, "vte_terminal_set_size", (void*)&vf->vte_terminal_set_size); - g_module_symbol(mod, "vte_terminal_fork_command", (void*)&vf->vte_terminal_fork_command); - g_module_symbol(mod, "vte_terminal_set_word_chars", (void*)&vf->vte_terminal_set_word_chars); - g_module_symbol(mod, "vte_terminal_set_mouse_autohide", (void*)&vf->vte_terminal_set_mouse_autohide); - g_module_symbol(mod, "vte_terminal_reset", (void*)&vf->vte_terminal_reset); - g_module_symbol(mod, "vte_terminal_get_type", (void*)&vf->vte_terminal_get_type); - g_module_symbol(mod, "vte_terminal_set_scroll_on_output", (void*)&vf->vte_terminal_set_scroll_on_output); - g_module_symbol(mod, "vte_terminal_set_scroll_on_keystroke", (void*)&vf->vte_terminal_set_scroll_on_keystroke); - g_module_symbol(mod, "vte_terminal_set_font_from_string", (void*)&vf->vte_terminal_set_font_from_string); - g_module_symbol(mod, "vte_terminal_set_scrollback_lines", (void*)&vf->vte_terminal_set_scrollback_lines); - g_module_symbol(mod, "vte_terminal_get_has_selection", (void*)&vf->vte_terminal_get_has_selection); - g_module_symbol(mod, "vte_terminal_copy_clipboard", (void*)&vf->vte_terminal_copy_clipboard); - g_module_symbol(mod, "vte_terminal_paste_clipboard", (void*)&vf->vte_terminal_paste_clipboard); - g_module_symbol(mod, "vte_terminal_set_emulation", (void*)&vf->vte_terminal_set_emulation); - g_module_symbol(mod, "vte_terminal_set_color_foreground", (void*)&vf->vte_terminal_set_color_foreground); - g_module_symbol(mod, "vte_terminal_set_color_bold", (void*)&vf->vte_terminal_set_color_bold); - g_module_symbol(mod, "vte_terminal_set_color_background", (void*)&vf->vte_terminal_set_color_background); - g_module_symbol(mod, "vte_terminal_feed_child", (void*)&vf->vte_terminal_feed_child); - g_module_symbol(mod, "vte_terminal_im_append_menuitems", (void*)&vf->vte_terminal_im_append_menuitems); - g_module_symbol(mod, "vte_terminal_set_cursor_blink_mode", (void*)&vf->vte_terminal_set_cursor_blink_mode); - if (vf->vte_terminal_set_cursor_blink_mode == NULL) +static gboolean vte_register_symbols(GModule *mod) +{ + #define BIND_SYMBOL(field) \ + g_module_symbol(mod, #field, (void*)&vf->field) + #define BIND_REQUIRED_SYMBOL(field) \ + G_STMT_START { \ + if (! BIND_SYMBOL(field)) \ + { \ + g_critical(_("invalid VTE library \"%s\": missing symbol \"%s\""), \ + g_module_name(mod), #field); \ + return FALSE; \ + } \ + } G_STMT_END + + BIND_REQUIRED_SYMBOL(vte_terminal_new); + BIND_REQUIRED_SYMBOL(vte_terminal_set_size); + BIND_REQUIRED_SYMBOL(vte_terminal_fork_command); + BIND_REQUIRED_SYMBOL(vte_terminal_set_word_chars); + BIND_REQUIRED_SYMBOL(vte_terminal_set_mouse_autohide); + BIND_REQUIRED_SYMBOL(vte_terminal_reset); + BIND_REQUIRED_SYMBOL(vte_terminal_get_type); + BIND_REQUIRED_SYMBOL(vte_terminal_set_scroll_on_output); + BIND_REQUIRED_SYMBOL(vte_terminal_set_scroll_on_keystroke); + BIND_REQUIRED_SYMBOL(vte_terminal_set_font_from_string); + BIND_REQUIRED_SYMBOL(vte_terminal_set_scrollback_lines); + BIND_REQUIRED_SYMBOL(vte_terminal_get_has_selection); + BIND_REQUIRED_SYMBOL(vte_terminal_copy_clipboard); + BIND_REQUIRED_SYMBOL(vte_terminal_paste_clipboard); + BIND_REQUIRED_SYMBOL(vte_terminal_set_emulation); + BIND_REQUIRED_SYMBOL(vte_terminal_set_color_foreground); + BIND_REQUIRED_SYMBOL(vte_terminal_set_color_bold); + BIND_REQUIRED_SYMBOL(vte_terminal_set_color_background); + BIND_REQUIRED_SYMBOL(vte_terminal_feed_child); + BIND_REQUIRED_SYMBOL(vte_terminal_im_append_menuitems); + if (! BIND_SYMBOL(vte_terminal_set_cursor_blink_mode)) /* vte_terminal_set_cursor_blink_mode() is only available since 0.17.1, so if we don't find * this symbol, we are probably on an older version and use the old API instead */ - g_module_symbol(mod, "vte_terminal_set_cursor_blinks", (void*)&vf->vte_terminal_set_cursor_blinks); - g_module_symbol(mod, "vte_terminal_select_all", (void*)&vf->vte_terminal_select_all); - g_module_symbol(mod, "vte_terminal_set_audible_bell", (void*)&vf->vte_terminal_set_audible_bell); + BIND_REQUIRED_SYMBOL(vte_terminal_set_cursor_blinks); + BIND_REQUIRED_SYMBOL(vte_terminal_select_all); + BIND_REQUIRED_SYMBOL(vte_terminal_set_audible_bell); + + #undef BIND_REQUIRED_SYMBOL + #undef BIND_SYMBOL + + return TRUE; } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] f1e88c: Ruby parser: don't create an extra scope after "for .. in .. do"
by Colomban Wendling 13 Sep '12

13 Sep '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 13 Sep 2012 14:34:18 Commit: f1e88ca311af3c3ced49f4b348d88140a74302b0 https://github.com/geany/geany/commit/f1e88ca311af3c3ced49f4b348d88140a7430… Log Message: ----------- Ruby parser: don't create an extra scope after "for .. in .. do" When "do" appears as the separator after a "for", "while" or "until" construct, don't improperly make it start its own scope too. Modified Paths: -------------- tagmanager/ctags/ruby.c Modified: tagmanager/ctags/ruby.c 26 files changed, 23 insertions(+), 3 deletions(-) =================================================================== @@ -287,6 +287,9 @@ static void findRubyTags (void) while ((line = fileReadLine ()) != NULL) { const unsigned char *cp = line; + /* if we expect a separator after a while, for, or until statement + * separators are "do", ";" or newline */ + boolean expect_separator = FALSE; if (canMatch (&cp, "=begin")) { @@ -318,10 +321,15 @@ static void findRubyTags (void) * puts("hello") \ * unless <exp> */ - if (canMatch (&cp, "case") || canMatch (&cp, "for") || - canMatch (&cp, "if") || canMatch (&cp, "unless") || + if (canMatch (&cp, "for") || canMatch (&cp, "until") || canMatch (&cp, "while")) { + expect_separator = TRUE; + enterUnnamedScope (); + } + else if (canMatch (&cp, "case") || canMatch (&cp, "if") || + canMatch (&cp, "unless")) + { enterUnnamedScope (); } @@ -362,10 +370,17 @@ static void findRubyTags (void) */ break; } - else if (canMatch (&cp, "begin") || canMatch (&cp, "do")) + else if (canMatch (&cp, "begin")) { enterUnnamedScope (); } + else if (canMatch (&cp, "do")) + { + if (! expect_separator) + enterUnnamedScope (); + else + expect_separator = FALSE; + } else if (canMatch (&cp, "end") && stringListCount (nesting) > 0) { /* Leave the most recent scope. */ @@ -383,6 +398,11 @@ static void findRubyTags (void) if (*cp == '"') cp++; /* skip the last found '"' */ } + else if (*cp == ';') + { + ++cp; + expect_separator = FALSE; + } else if (*cp != '\0') { do @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany] da5bb7: Don't access GtkColorSelectionDialog fields directly
by Colomban Wendling 13 Sep '12

13 Sep '12

1 0

[geany/geany] 9f479b: Regenerate Python tag list
by Enrico Tröger 12 Sep '12

12 Sep '12

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Wed, 12 Sep 2012 17:30:56 Commit: 9f479b861a2405f23fdd117b3eb54ed269688da4 https://github.com/geany/geany/commit/9f479b861a2405f23fdd117b3eb54ed269688… Log Message: ----------- Regenerate Python tag list Generated against a clean Python 2.7 installation. Modified Paths: -------------- data/python.tags Modified: data/python.tags 52 files changed, 5 insertions(+), 47 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -# format=tagmanager - Automatically generated file - do not edit (created on Wed Aug 29 23:01:33 2012) +# format=tagmanager - Automatically generated file - do not edit (created on Wed Sep 12 19:28:34 2012) <lambda>Ì128Í ABCMetaÌ1Í(type) ARRAYÌ128Ítyp, len @@ -348,7 +348,7 @@ DocCGIXMLRPCRequestHandler DocDescriptorÌ1Í(object) DocFileCaseÌ1Í(DocTestCase) DocFileSuiteÌ128Í*paths, **kw -DocFileTestÌ128Ípath, module_relative=True, package=None, globs=None, parser=<tags_file_module.DocTestParser instance at 0x1f42d40>, encoding=None, **options +DocFileTestÌ128Ípath, module_relative=True, package=None, globs=None, parser=<tags_file_module.DocTestParser instance at 0x1b44c20>, encoding=None, **options DocTestCaseÌ1Í(TestCase) DocTestFailureÌ1Í(Exception) DocTestFinderÌ1Í @@ -1752,8 +1752,6 @@ arith_expr arrayÌ1Í(object) artcmdÌ128Íself, line, file=NoneÎNNTP articleÌ128Íself, idÎNNTP -associateÌ128Í(self, secondaryDB, callback, flags=0) -assure_pickle_consistencyÌ128Í(verbose=False) atofÌ128Ís atoiÌ128Í*args atolÌ128Í*args @@ -1975,7 +1973,6 @@ choose_boundary chownÌ128Íself, tarinfo, targetpathÎTarFile cipherÌ128ÍselfÎSSLSocket circleÌ128Íself, radius, extent=None, steps=NoneÎTurtle -classifyÌ128Í(self, type, value, context) cleandocÌ128Ídoc cleanup_headersÌ128ÍselfÎServerHandler cleanup_tracebackÌ128Ítb, exclude @@ -2200,7 +2197,7 @@ createTextNode create_arcÌ128Íself, *args, **kwÎCanvas create_bitmapÌ128Íself, *args, **kwÎCanvas create_command_buttonsÌ128ÍselfÎReplaceDialog -create_connectionÌ128Íaddress, timeout=<object object at 0x7f3698d580d0>, source_address=None +create_connectionÌ128Íaddress, timeout=<object object at 0x7fb3c1f220d0>, source_address=None create_decimal_from_floatÌ128Íself, fÎContext create_decimalÌ128Íself, num='0'ÎContext create_entriesÌ128ÍselfÎReplaceDialog @@ -2279,9 +2276,7 @@ dedent_region_event dedentÌ128Ítext deepcopyÌ128Íx, memo=None, _nil=[] deepvaluesÌ128Í(mapping) -default_loaderÌ128Í(href, parse, encoding=None) degreesÌ128Íself, fullcircle=360.0ÎTurtle -deleteÌ128Í(self, *args, **kwargs) demo_appÌ128Íenviron, start_response demoÌ128Í deprecated_funcÌ128Í*args, **kwargsÎDocFileCase @@ -2813,7 +2808,6 @@ focus_lastfor focus_setÌ128ÍselfÎBaseWidget focusÌ128Íself, *argsÎCanvas font_timer_eventÌ128ÍselfÎCodeContext -format_date_timeÌ128Í(timestamp) found_terminatorÌ128ÍselfÎSMTPChannel fpdefÌ128Íself, nodelistÎTransformer fplistÌ128Íself, nodelistÎTransformer @@ -2827,7 +2821,6 @@ framework_info frameÌ1Í(object) freeze_supportÌ128Í freeÌ128Íself, blockÎHeap -fromstringlistÌ128Í(sequence, parser=None) frozensetÌ128Í ftp_openÌ128Íself, reqÎCacheFTPHandler ftpcpÌ128Ísource, sourcename, target, targetname='', type='I' @@ -3609,28 +3602,6 @@ image_types imap_unorderedÌ128Í(self, func, iterable, chunksize=1) imapÌ1Í(object) immutableÌ128ÍselfÎMutableString -in_special_contextÌ128Í(node) -includeÌ128Í(elem, loader=None) -init_valueÌ128Í(self, *args, **kwargs) -initialize_optionsÌ128Í(self) -initializeÌ128Í(self, plat_name=None) -insertÌ128Í(self, index, element) -isOpenÌ128Í(self) -is_HDNÌ128Í(text) -is_assign_targetÌ128Í(node) -is_blockedÌ128Í(self, domain) -is_docstringÌ128Í(stmt) -is_expiredÌ128Í(self, now=None) -is_import_stmtÌ128Í(node) -is_importÌ128Í(node) -is_listÌ128Í(node) -is_not_allowedÌ128Í(self, domain) -is_probably_builtinÌ128Í(node) -is_subtreeÌ128Í(root, node) -is_third_partyÌ128Í(request) -is_tupleÌ128Í(node) -iselementÌ128Í(element) -iso2timeÌ128Í(text) item_cgetÌ128Íself, entry, col, optÎHList item_configureÌ128Íself, entry, col, cnf={}, **kwÎHList item_createÌ128Íself, entry, col, cnf={}, **kwÎHList @@ -4071,7 +4042,6 @@ normalize normalvariateÌ128Íself, mu, sigmaÎRandom normcaseÌ128Ípath normpathÌ128Ís -notationDeclÌ128Í(self, name, publicId, systemId) nr_of_itemsÌ128ÍselfÎTbuffer nsmallestÌ128Ín, iterable, key=None ntohlÌ128Íx @@ -4337,10 +4307,6 @@ press prev_nodupÌ128Í(self, flags=0) previousÌ128ÍselfÎBsdDbShelf prevÌ128Í(self, flags=0) -print_acÌ128Í(self) -print_nodeÌ128Í(node) -print_outputÌ128Í(self, old, new, filename, equal) -printtokenÌ128Í(type, token, start, end, line) prmonthÌ128Íself, theyear, themonth, w=0, l=0ÎLocaleTextCalendar probably_a_local_importÌ128Í(self, imp_name) process_messageÌ128Íself, peer, mailfrom, rcpttos, dataÎDebuggingServer @@ -4425,7 +4391,6 @@ r_reload r_unloadÌ128Íself, mÎRExec radiansÌ128ÍselfÎTurtle radixÌ128ÍselfÎDecimal -raise_errorÌ128Í(self, msg, *args) randintÌ128Íself, a, bÎRandom randombytesÌ128Ín randomÌ128ÍselfÎSystemRandom @@ -4680,13 +4645,6 @@ retry_https_basic_auth retry_proxy_http_basic_authÌ128Íself, url, realm, data=NoneÎFancyURLopener retry_proxy_https_basic_authÌ128Íself, url, realm, data=NoneÎFancyURLopener retrÌ128Íself, whichÎPOP3 -return_ok_domainÌ128Í(self, cookie, request) -return_ok_expiresÌ128Í(self, cookie, request) -return_ok_portÌ128Í(self, cookie, request) -return_ok_secureÌ128Í(self, cookie, request) -return_ok_verifiabilityÌ128Í(self, cookie, request) -return_ok_versionÌ128Í(self, cookie, request) -return_okÌ128Í(self, cookie, request) reverse_orderÌ128ÍselfÎStats reversedÌ128Í reverseÌ128ÍselfÎMutableSequence @@ -5441,7 +5399,7 @@ test_wav test_xbmÌ128Íh, f testallÌ128Ílist, recursive, toplevel testandsetÌ128ÍselfÎmutex -testfileÌ128Ífilename, module_relative=True, name=None, package=None, globs=None, verbose=None, report=True, optionflags=0, extraglobs=None, raise_on_error=False, parser=<tags_file_module.DocTestParser instance at 0x1f42b48>, encoding=None +testfileÌ128Ífilename, module_relative=True, name=None, package=None, globs=None, verbose=None, report=True, optionflags=0, extraglobs=None, raise_on_error=False, parser=<tags_file_module.DocTestParser instance at 0x1b44a70>, encoding=None testlist_compÌ128Íself, nodelistÎTransformer testlistÌ128Íself, nodelistÎTransformer testmodÌ128Ím=None, name=None, globs=None, verbose=None, report=True, optionflags=0, extraglobs=None, raise_on_error=False, exclude_empty=False @@ -5684,7 +5642,7 @@ urlcleanup urldefragÌ128Íurl urlencodeÌ128Íquery, doseq=0 urljoinÌ128Íbase, url, allow_fragments=True -urlopenÌ128Íurl, data=None, timeout=<object object at 0x7f3698d580c0> +urlopenÌ128Íurl, data=None, timeout=<object object at 0x7fb3c1f220c0> urlparseÌ128Íurl, scheme='', allow_fragments=True urlretrieveÌ128Íurl, filename=None, reporthook=None, data=None urlsafe_b64decodeÌ128Ís @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2012