diff options
| author | Jan D | 2010-08-18 08:30:54 +0200 |
|---|---|---|
| committer | Jan D | 2010-08-18 08:30:54 +0200 |
| commit | e1e18511e3a9c914db7a7a6fbae5737f7cf96553 (patch) | |
| tree | 90a77c987a358066fe33aff4243fdc2117448df5 /src | |
| parent | 64cb6c788376c364c8e27e99c97921ad3a308963 (diff) | |
| download | emacs-e1e18511e3a9c914db7a7a6fbae5737f7cf96553.tar.gz emacs-e1e18511e3a9c914db7a7a6fbae5737f7cf96553.zip | |
* gtkutil.c (update_frame_tool_bar): Literal stings are const char*.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/gtkutil.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 589265586c7..060b8fb739f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-08-18 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * gtkutil.c (update_frame_tool_bar): Literal stings are const char*. | ||
| 4 | |||
| 1 | 2010-08-18 David De La Harpe Golden <david@harpegolden.net> | 5 | 2010-08-18 David De La Harpe Golden <david@harpegolden.net> |
| 2 | 6 | ||
| 3 | * nsselect.m (QCLIPBOARD, NXPrimaryPboard): Define. | 7 | * nsselect.m (QCLIPBOARD, NXPrimaryPboard): Define. |
diff --git a/src/gtkutil.c b/src/gtkutil.c index 5cfc980c5b8..dbd48eb5272 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -4292,8 +4292,8 @@ update_frame_tool_bar (FRAME_PTR f) | |||
| 4292 | GtkWidget *wbutton = NULL; | 4292 | GtkWidget *wbutton = NULL; |
| 4293 | GtkWidget *weventbox; | 4293 | GtkWidget *weventbox; |
| 4294 | Lisp_Object specified_file; | 4294 | Lisp_Object specified_file; |
| 4295 | char *label = (STRINGP (PROP (TOOL_BAR_ITEM_LABEL)) | 4295 | const char *label = (STRINGP (PROP (TOOL_BAR_ITEM_LABEL)) |
| 4296 | ? SSDATA (PROP (TOOL_BAR_ITEM_LABEL)) : ""); | 4296 | ? SSDATA (PROP (TOOL_BAR_ITEM_LABEL)) : ""); |
| 4297 | 4297 | ||
| 4298 | ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i); | 4298 | ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i); |
| 4299 | 4299 | ||